From 99ea3ca9b59356207b70d2efea845d48ec7f9204 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 8 Dec 2015 17:47:12 -0800
Subject: [PATCH 1/7] Moved a paren.

---
 src/compiler/emitter.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index a73d7374b59b1..f0b498547343d 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -5260,11 +5260,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 writeLine();
                 emitToken(SyntaxKind.CloseBraceToken, node.members.end);
                 emitStart(node);
-                write(")(");
+                write("(");
                 if (baseTypeNode) {
                     emit(baseTypeNode.expression);
                 }
-                write(")");
+                write("))");
                 if (node.kind === SyntaxKind.ClassDeclaration) {
                     write(";");
                 }

From c8baadfbc20363ee7403039cf0d5d86819893b87 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 8 Dec 2015 17:49:29 -0800
Subject: [PATCH 2/7] Updated unit test.

---
 tests/cases/unittests/transpile.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts
index 4781182224bae..513d37673bb1a 100644
--- a/tests/cases/unittests/transpile.ts
+++ b/tests/cases/unittests/transpile.ts
@@ -256,7 +256,7 @@ var x = 0;`,
                 `    ], MyClass);\n` + 
                 `    return MyClass;\n` + 
                 `    var _a;\n` + 
-                `})();\n` + 
+                `}());\n` + 
                 `exports.MyClass = MyClass;\n`;
 
             test(input, 

From 61972a9f076ee3252474e5c24b7553099f4f2b48 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 8 Dec 2015 17:51:05 -0800
Subject: [PATCH 3/7] Accepted baselines for non-project tests.

---
 tests/baselines/reference/2dArrays.js         |   6 +-
 ...onAmbientClassWithSameNameAndCommonRoot.js |   2 +-
 ...hModuleMemberThatUsesClassTypeParameter.js |  12 +-
 ...GenericClassStaticFunctionOfTheSameName.js |   2 +-
 ...GenericClassStaticFunctionOfTheSameName.js |   2 +-
 ...dStaticFunctionUsingClassPrivateStatics.js |   2 +-
 ...nctionAndExportedFunctionThatShareAName.js |   4 +-
 ...ionAndNonExportedFunctionThatShareAName.js |   4 +-
 ...ticVariableAndExportedVarThatShareAName.js |   4 +-
 ...VariableAndNonExportedVarThatShareAName.js |   4 +-
 ...ClassAndModuleWithSameNameAndCommonRoot.js |   4 +-
 .../baselines/reference/ClassDeclaration10.js |   2 +-
 .../baselines/reference/ClassDeclaration11.js |   2 +-
 .../baselines/reference/ClassDeclaration13.js |   2 +-
 .../baselines/reference/ClassDeclaration14.js |   2 +-
 .../baselines/reference/ClassDeclaration15.js |   2 +-
 .../baselines/reference/ClassDeclaration21.js |   2 +-
 .../baselines/reference/ClassDeclaration22.js |   2 +-
 .../baselines/reference/ClassDeclaration24.js |   2 +-
 .../baselines/reference/ClassDeclaration25.js |   2 +-
 .../baselines/reference/ClassDeclaration26.js |   2 +-
 .../baselines/reference/ClassDeclaration8.js  |   2 +-
 .../baselines/reference/ClassDeclaration9.js  |   2 +-
 ...onWithInvalidConstOnPropertyDeclaration.js |   2 +-
 ...nWithInvalidConstOnPropertyDeclaration2.js |   2 +-
 .../reference/ES5For-ofTypeCheck10.js         |   2 +-
 .../baselines/reference/ES5SymbolProperty2.js |   2 +-
 .../baselines/reference/ES5SymbolProperty3.js |   2 +-
 .../baselines/reference/ES5SymbolProperty4.js |   2 +-
 .../baselines/reference/ES5SymbolProperty5.js |   2 +-
 .../baselines/reference/ES5SymbolProperty6.js |   2 +-
 .../baselines/reference/ES5SymbolProperty7.js |   2 +-
 .../EnumAndModuleWithSameNameAndCommonRoot.js |   2 +-
 .../baselines/reference/ExportAssignment7.js  |   2 +-
 .../baselines/reference/ExportAssignment8.js  |   2 +-
 ...ichExtendsInterfaceWithInaccessibleType.js |   2 +-
 ...sClassHeritageListMemberTypeAnnotations.js |   6 +-
 ...naccessibleTypeInIndexerTypeAnnotations.js |   4 +-
 ...accessibleTypeInTypeParameterConstraint.js |   6 +-
 ...TypesInParameterAndReturnTypeAnnotation.js |   4 +-
 ...ccessibleTypesInParameterTypeAnnotation.js |   4 +-
 ...InaccessibleTypesInReturnTypeAnnotation.js |   4 +-
 ...WithAccessibleTypesOnItsExportedMembers.js |   4 +-
 ...hAccessibleTypesInMemberTypeAnnotations.js |   2 +-
 ...sibleTypesInNestedMemberTypeAnnotations.js |   2 +-
 ...cTypeWithInaccessibleTypeAsTypeArgument.js |   2 +-
 .../reference/MemberAccessorDeclaration15.js  |   2 +-
 .../MemberFunctionDeclaration1_es6.js         |   2 +-
 .../MemberFunctionDeclaration2_es6.js         |   2 +-
 .../MemberFunctionDeclaration3_es6.js         |   2 +-
 .../MemberFunctionDeclaration4_es6.js         |   2 +-
 .../MemberFunctionDeclaration5_es6.js         |   2 +-
 .../MemberFunctionDeclaration6_es6.js         |   2 +-
 .../MemberFunctionDeclaration7_es6.js         |   2 +-
 .../MemberFunctionDeclaration8_es6.js         |   2 +-
 ...ModuleAndClassWithSameNameAndCommonRoot.js |   4 +-
 .../ModuleAndEnumWithSameNameAndCommonRoot.js |   2 +-
 ...ModuleWithExportedAndNonExportedClasses.js |   8 +-
 ...leWithExportedAndNonExportedImportAlias.js |   2 +-
 .../NonInitializedExportInInternalModule.js   |   4 +-
 tests/baselines/reference/ParameterList6.js   |   2 +-
 tests/baselines/reference/ParameterList7.js   |   2 +-
 tests/baselines/reference/Protected1.js       |   2 +-
 tests/baselines/reference/Protected3.js       |   2 +-
 tests/baselines/reference/Protected4.js       |   2 +-
 tests/baselines/reference/Protected5.js       |   2 +-
 tests/baselines/reference/Protected6.js       |   2 +-
 tests/baselines/reference/Protected7.js       |   2 +-
 tests/baselines/reference/Protected9.js       |   2 +-
 ...ortedAndNonExportedClassesOfTheSameName.js |   8 +-
 ...tedAndNonExportedLocalVarsOfTheSameName.js |   2 +-
 ...rgeEachWithExportedClassesOfTheSameName.js |   8 +-
 ...eEachWithExportedLocalVarsOfTheSameName.js |   2 +-
 ...rgeEachWithExportedModulesOfTheSameName.js |   4 +-
 ...esWithTheSameNameAndDifferentCommonRoot.js |   2 +-
 ...ModulesWithTheSameNameAndSameCommonRoot.js |   2 +-
 .../reference/TypeGuardWithArrayUnion.js      |   2 +-
 .../reference/YieldExpression11_es6.js        |   2 +-
 .../reference/YieldExpression12_es6.js        |   2 +-
 .../reference/YieldExpression14_es6.js        |   2 +-
 .../accessOverriddenBaseClassMember1.js       |   4 +-
 .../reference/accessibilityModifiers.js       |   6 +-
 .../accessorParameterAccessibilityModifier.js |   2 +-
 tests/baselines/reference/accessorWithES3.js  |   4 +-
 tests/baselines/reference/accessorWithES5.js  |   4 +-
 .../reference/accessorWithInitializer.js      |   2 +-
 ...sorWithMismatchedAccessibilityModifiers.js |   8 +-
 .../reference/accessorWithRestParam.js        |   2 +-
 .../accessorsAreNotContextuallyTyped.js       |   2 +-
 tests/baselines/reference/accessorsEmit.js    |   6 +-
 .../reference/accessorsNotAllowedInES3.js     |   2 +-
 .../accessors_spec_section-4.5_error-cases.js |   2 +-
 .../accessors_spec_section-4.5_inference.js   |   6 +-
 .../additionOperatorWithAnyAndEveryType.js    |   2 +-
 .../additionOperatorWithInvalidOperands.js    |   2 +-
 tests/baselines/reference/aliasAssignments.js |   2 +-
 tests/baselines/reference/aliasBug.js         |   4 +-
 tests/baselines/reference/aliasErrors.js      |   4 +-
 .../reference/aliasInaccessibleModule2.js     |   2 +-
 .../reference/aliasUsageInAccessorsOfClass.js |   6 +-
 .../baselines/reference/aliasUsageInArray.js  |   4 +-
 .../aliasUsageInFunctionExpression.js         |   4 +-
 .../reference/aliasUsageInGenericFunction.js  |   4 +-
 .../reference/aliasUsageInIndexerOfClass.js   |   8 +-
 .../reference/aliasUsageInObjectLiteral.js    |   4 +-
 .../reference/aliasUsageInOrExpression.js     |   4 +-
 ...aliasUsageInTypeArgumentOfExtendsClause.js |   8 +-
 .../reference/aliasUsageInVarAssignment.js    |   4 +-
 .../allowSyntheticDefaultImports1.js          |   2 +-
 .../allowSyntheticDefaultImports2.js          |   2 +-
 .../allowSyntheticDefaultImports3.js          |   2 +-
 ...ntExternalModuleInAnotherExternalModule.js |   2 +-
 .../ambiguousCallsWhereReturnTypesAgree.js    |   4 +-
 .../reference/ambiguousOverloadResolution.js  |   4 +-
 .../amdImportNotAsPrimaryExpression.js        |   2 +-
 tests/baselines/reference/amdModuleName1.js   |   2 +-
 tests/baselines/reference/amdModuleName2.js   |   2 +-
 tests/baselines/reference/anonterface.js      |   2 +-
 .../reference/anonymousClassExpression1.js    |   2 +-
 .../reference/anyAsGenericFunctionCall.js     |   2 +-
 .../anyAssignabilityInInheritance.js          |   6 +-
 .../reference/anyAssignableToEveryType.js     |   2 +-
 .../reference/anyAssignableToEveryType2.js    |   6 +-
 .../reference/anyIdenticalToItself.js         |   2 +-
 .../reference/apparentTypeSubtyping.js        |   8 +-
 .../reference/apparentTypeSupertype.js        |   4 +-
 tests/baselines/reference/argsInScope.js      |   2 +-
 .../argumentsUsedInObjectLiteralProperty.js   |   2 +-
 .../baselines/reference/arithAssignTyping.js  |   2 +-
 .../reference/arrayAssignmentTest1.js         |   6 +-
 .../reference/arrayAssignmentTest2.js         |   6 +-
 .../reference/arrayAssignmentTest3.js         |   4 +-
 .../reference/arrayAssignmentTest4.js         |   2 +-
 .../reference/arrayAssignmentTest5.js         |   2 +-
 .../reference/arrayAssignmentTest6.js         |   2 +-
 .../reference/arrayBestCommonTypes.js         |  16 +-
 .../reference/arrayLiteralContextualType.js   |   4 +-
 .../reference/arrayLiteralTypeInference.js    |   6 +-
 tests/baselines/reference/arrayLiterals.js    |   8 +-
 .../arrayLiteralsWithRecursiveGenerics.js     |   6 +-
 .../reference/arrayOfExportedClass.js         |   4 +-
 .../reference/arrayOfFunctionTypes3.js        |   2 +-
 .../arrayReferenceWithoutTypeArgs.js          |   2 +-
 tests/baselines/reference/arrayconcat.js      |   2 +-
 .../reference/arrowFunctionContexts.js        |   8 +-
 .../reference/arrowFunctionExpressions.js     |   2 +-
 .../arrowFunctionInConstructorArgument1.js    |   2 +-
 tests/baselines/reference/asOperatorASI.js    |   2 +-
 tests/baselines/reference/asiAbstract.js      |   6 +-
 tests/baselines/reference/asiInES6Classes.js  |   2 +-
 .../reference/asiPublicPrivateProtected.js    |  14 +-
 .../assertInWrapSomeTypeParameter.js          |   2 +-
 .../reference/assignAnyToEveryType.js         |   2 +-
 .../reference/assignEveryTypeToAny.js         |   2 +-
 .../reference/assignToExistingClass.js        |   4 +-
 ...assignToObjectTypeWithPrototypeProperty.js |   2 +-
 .../reference/assignmentCompatBug3.js         |   2 +-
 ...CompatInterfaceWithStringIndexSignature.js |   2 +-
 .../reference/assignmentCompatOnNew.js        |   2 +-
 .../assignmentCompatWithCallSignatures3.js    |   8 +-
 .../assignmentCompatWithCallSignatures4.js    |   8 +-
 .../assignmentCompatWithCallSignatures5.js    |   8 +-
 .../assignmentCompatWithCallSignatures6.js    |   8 +-
 ...ssignmentCompatWithConstructSignatures3.js |   8 +-
 ...ssignmentCompatWithConstructSignatures4.js |   8 +-
 ...ssignmentCompatWithConstructSignatures5.js |   8 +-
 ...ssignmentCompatWithConstructSignatures6.js |   8 +-
 ...ricCallSignaturesWithOptionalParameters.js |   8 +-
 .../assignmentCompatWithNumericIndexer.js     |   6 +-
 .../assignmentCompatWithNumericIndexer3.js    |   6 +-
 .../assignmentCompatWithObjectMembers.js      |   8 +-
 .../assignmentCompatWithObjectMembers2.js     |   4 +-
 .../assignmentCompatWithObjectMembers3.js     |   4 +-
 .../assignmentCompatWithObjectMembers4.js     |  20 +-
 .../assignmentCompatWithObjectMembers5.js     |   2 +-
 ...entCompatWithObjectMembersAccessibility.js |  12 +-
 ...mentCompatWithObjectMembersNumericNames.js |   4 +-
 ...nmentCompatWithObjectMembersOptionality.js |   6 +-
 ...mentCompatWithObjectMembersOptionality2.js |   6 +-
 ...mpatWithObjectMembersStringNumericNames.js |   8 +-
 .../assignmentCompatWithOverloads.js          |   2 +-
 .../assignmentCompatWithStringIndexer.js      |   8 +-
 .../assignmentCompatWithStringIndexer3.js     |   2 +-
 .../reference/assignmentCompatability10.js    |   2 +-
 .../reference/assignmentCompatability39.js    |   2 +-
 .../reference/assignmentCompatability40.js    |   2 +-
 .../reference/assignmentCompatability41.js    |   2 +-
 .../reference/assignmentCompatability42.js    |   2 +-
 .../reference/assignmentCompatability8.js     |   2 +-
 .../reference/assignmentCompatability9.js     |   2 +-
 .../reference/assignmentLHSIsValue.js         |   4 +-
 .../assignmentNonObjectTypeConstraints.js     |   4 +-
 .../assignmentToParenthesizedIdentifiers.js   |   2 +-
 .../reference/assignmentToReferenceTypes.js   |   2 +-
 tests/baselines/reference/assignments.js      |   2 +-
 .../reference/augmentedTypesClass.js          |   4 +-
 .../reference/augmentedTypesClass2.js         |   6 +-
 .../reference/augmentedTypesClass2a.js        |   2 +-
 .../reference/augmentedTypesClass3.js         |   8 +-
 .../reference/augmentedTypesClass4.js         |   4 +-
 .../baselines/reference/augmentedTypesEnum.js |   2 +-
 .../reference/augmentedTypesEnum2.js          |   2 +-
 .../augmentedTypesExternalModule1.js          |   2 +-
 .../reference/augmentedTypesFunction.js       |   4 +-
 .../reference/augmentedTypesInterface.js      |   2 +-
 .../reference/augmentedTypesModules.js        |  16 +-
 .../reference/augmentedTypesModules2.js       |   2 +-
 .../reference/augmentedTypesModules3.js       |   4 +-
 .../reference/augmentedTypesModules3b.js      |   6 +-
 .../reference/augmentedTypesModules4.js       |   2 +-
 .../baselines/reference/augmentedTypesVar.js  |   4 +-
 .../autoAsiForStaticsInClassDeclaration.js    |   2 +-
 tests/baselines/reference/autoLift2.js        |   2 +-
 tests/baselines/reference/autolift3.js        |   2 +-
 tests/baselines/reference/autolift4.js        |   4 +-
 tests/baselines/reference/avoid.js            |   2 +-
 tests/baselines/reference/badArraySyntax.js   |   2 +-
 tests/baselines/reference/badThisBinding.js   |   2 +-
 tests/baselines/reference/baseCheck.js        |  12 +-
 .../reference/baseIndexSignatureResolution.js |   4 +-
 .../reference/baseTypeAfterDerivedType.js     |   2 +-
 .../reference/baseTypeOrderChecking.js        |   8 +-
 .../reference/baseTypePrivateMemberClash.js   |   4 +-
 .../baseTypeWrappingInstantiationChain.js     |  10 +-
 tests/baselines/reference/bases.js            |   4 +-
 .../bestCommonTypeOfConditionalExpressions.js |   6 +-
 ...bestCommonTypeOfConditionalExpressions2.js |   6 +-
 .../reference/bestCommonTypeOfTuple2.js       |  12 +-
 tests/baselines/reference/bind1.js            |   2 +-
 .../binopAssignmentShouldHaveType.js          |   2 +-
 .../bitwiseNotOperatorWithAnyOtherType.js     |   2 +-
 .../bitwiseNotOperatorWithBooleanType.js      |   2 +-
 .../bitwiseNotOperatorWithNumberType.js       |   2 +-
 .../bitwiseNotOperatorWithStringType.js       |   2 +-
 .../blockScopedVariablesUseBeforeDef.js       |  16 +-
 ...ctionWithIncorrectNumberOfTypeArguments.js |   4 +-
 ...allGenericFunctionWithZeroTypeArguments.js |   4 +-
 ...callNonGenericFunctionWithTypeArguments.js |   4 +-
 tests/baselines/reference/callOnClass.js      |   2 +-
 .../callOverloadViaElementAccessExpression.js |   2 +-
 tests/baselines/reference/callOverloads1.js   |   2 +-
 tests/baselines/reference/callOverloads2.js   |   2 +-
 tests/baselines/reference/callOverloads3.js   |   2 +-
 tests/baselines/reference/callOverloads4.js   |   2 +-
 tests/baselines/reference/callOverloads5.js   |   2 +-
 ...allSignatureAssignabilityInInheritance2.js |   8 +-
 ...allSignatureAssignabilityInInheritance3.js |   8 +-
 ...allSignatureAssignabilityInInheritance4.js |   8 +-
 ...allSignatureAssignabilityInInheritance5.js |   8 +-
 ...allSignatureAssignabilityInInheritance6.js |   8 +-
 ...tureWithOptionalParameterAndInitializer.js |   2 +-
 ...ureWithoutReturnTypeAnnotationInference.js |   6 +-
 ...sWithAccessibilityModifiersOnParameters.js |   2 +-
 .../callSignaturesWithDuplicateParameters.js  |   2 +-
 .../callSignaturesWithOptionalParameters.js   |   2 +-
 .../callSignaturesWithOptionalParameters2.js  |   2 +-
 ...callSignaturesWithParameterInitializers.js |   2 +-
 ...allSignaturesWithParameterInitializers2.js |   2 +-
 tests/baselines/reference/callWithSpread.js   |   4 +-
 .../cannotInvokeNewOnErrorExpression.js       |   2 +-
 .../reference/captureThisInSuperCall.js       |   4 +-
 .../reference/capturedLetConstInLoop10.js     |   4 +-
 .../reference/capturedLetConstInLoop9.js      |   4 +-
 tests/baselines/reference/castParentheses.js  |   2 +-
 tests/baselines/reference/castingTuple.js     |  10 +-
 .../baselines/reference/chainedAssignment1.js |   6 +-
 .../baselines/reference/chainedAssignment3.js |   4 +-
 .../reference/chainedAssignmentChecking.js    |   6 +-
 ...arameterConstrainedToOtherTypeParameter.js |   8 +-
 ...rameterConstrainedToOtherTypeParameter2.js |   4 +-
 .../reference/checkForObjectTooStrict.js      |   6 +-
 .../checkSwitchStatementIfCaseTypeIsString.js |   2 +-
 .../reference/circularImportAlias.js          |   4 +-
 .../baselines/reference/circularReference.js  |   4 +-
 .../circularTypeAliasForUnionWithClass.js     |   6 +-
 tests/baselines/reference/class2.js           |   2 +-
 .../reference/classAbstractAsIdentifier.js    |   2 +-
 ...bstractAssignabilityConstructorFunction.js |   2 +-
 .../classAbstractClinterfaceAssignability.js  |   2 +-
 .../reference/classAbstractConstructor.js     |   2 +-
 .../classAbstractConstructorAssignability.js  |   6 +-
 .../reference/classAbstractCrashedOnce.js     |   4 +-
 .../reference/classAbstractExtends.js         |  10 +-
 .../reference/classAbstractFactoryFunction.js |   4 +-
 .../reference/classAbstractGeneric.js         |  14 +-
 .../classAbstractImportInstantiation.js       |   2 +-
 .../reference/classAbstractInAModule.js       |   4 +-
 .../reference/classAbstractInheritance.js     |  20 +-
 .../reference/classAbstractInstantiations1.js |   6 +-
 .../reference/classAbstractInstantiations2.js |  16 +-
 .../reference/classAbstractManyKeywords.js    |   8 +-
 .../classAbstractMergedDeclaration.js         |  16 +-
 .../classAbstractMethodInNonAbstractClass.js  |   4 +-
 .../classAbstractMethodWithImplementation.js  |   2 +-
 .../classAbstractMixedWithModifiers.js        |   2 +-
 .../reference/classAbstractOverloads.js       |   4 +-
 .../classAbstractOverrideWithAbstract.js      |  12 +-
 .../reference/classAbstractProperties.js      |   2 +-
 .../reference/classAbstractSingleLineDecl.js  |   6 +-
 .../reference/classAbstractSuperCalls.js      |  10 +-
 .../classAbstractUsingAbstractMethod1.js      |   6 +-
 .../classAbstractUsingAbstractMethods2.js     |  18 +-
 .../classAndInterfaceWithSameName.js          |   4 +-
 .../reference/classAndVariableWithSameName.js |   4 +-
 .../classAppearsToHaveMembersOfObject.js      |   2 +-
 .../reference/classBodyWithStatements.js      |   6 +-
 .../reference/classCannotExtendVar.js         |   2 +-
 .../classConstructorAccessibility.js          |  12 +-
 ...classConstructorParametersAccessibility.js |   8 +-
 ...lassConstructorParametersAccessibility2.js |   8 +-
 ...lassConstructorParametersAccessibility3.js |   4 +-
 .../classDeclarationBlockScoping1.js          |   4 +-
 .../classDeclarationBlockScoping2.js          |   4 +-
 ...clarationMergedInModuleWithContinuation.js |   4 +-
 .../classDoesNotDependOnBaseTypes.js          |   4 +-
 .../classDoesNotDependOnPrivateMember.js      |   2 +-
 tests/baselines/reference/classExpression.js  |   6 +-
 tests/baselines/reference/classExpression1.js |   2 +-
 tests/baselines/reference/classExpression2.js |   4 +-
 tests/baselines/reference/classExpression3.js |   6 +-
 tests/baselines/reference/classExpression4.js |   2 +-
 .../classExpressionExtendingAbstractClass.js  |   4 +-
 .../reference/classExpressionTest1.js         |   2 +-
 .../reference/classExpressionTest2.js         |   2 +-
 .../classExpressionWithDecorator1.js          |   2 +-
 ...onWithResolutionOfNamespaceOfSameName01.js |   2 +-
 .../classExpressionWithStaticProperties1.js   |   2 +-
 .../classExpressionWithStaticProperties2.js   |   2 +-
 .../reference/classExtendingBuiltinType.js    |  20 +-
 .../reference/classExtendingClass.js          |   8 +-
 .../reference/classExtendingClassLikeType.js  |  12 +-
 .../reference/classExtendingNonConstructor.js |  14 +-
 .../baselines/reference/classExtendingNull.js |   4 +-
 .../reference/classExtendingPrimitive.js      |  20 +-
 .../reference/classExtendingPrimitive2.js     |   4 +-
 .../reference/classExtendingQualifiedName.js  |   4 +-
 .../reference/classExtendingQualifiedName2.js |   4 +-
 ...sMergedWithModuleNotReferingConstructor.js |   4 +-
 ...tendsClauseClassNotReferringConstructor.js |   4 +-
 .../reference/classExtendsEveryObjectType.js  |  12 +-
 .../reference/classExtendsEveryObjectType2.js |   4 +-
 .../reference/classExtendsInterface.js        |   8 +-
 ...sInterfaceThatExtendsClassWithPrivates1.js |   4 +-
 .../baselines/reference/classExtendsItself.js |   6 +-
 .../reference/classExtendsItselfIndirectly.js |  12 +-
 .../classExtendsItselfIndirectly2.js          |  12 +-
 .../classExtendsItselfIndirectly3.js          |  12 +-
 .../classExtendsMultipleBaseClasses.js        |   6 +-
 tests/baselines/reference/classExtendsNull.js |   4 +-
 ...classExtendsShadowedConstructorFunction.js |   4 +-
 .../classExtendsValidConstructorFunction.js   |   2 +-
 .../classHeritageWithTrailingSeparator.js     |   4 +-
 .../classImplementingInterfaceIndexer.js      |   2 +-
 .../reference/classImplementsClass1.js        |   4 +-
 .../reference/classImplementsClass2.js        |   6 +-
 .../reference/classImplementsClass3.js        |   6 +-
 .../reference/classImplementsClass4.js        |   6 +-
 .../reference/classImplementsClass5.js        |   6 +-
 .../reference/classImplementsClass6.js        |   6 +-
 .../classImplementsImportedInterface.js       |   2 +-
 .../classImplementsMergedClassInterface.js    |   8 +-
 tests/baselines/reference/classIndexer.js     |   2 +-
 tests/baselines/reference/classIndexer2.js    |   2 +-
 tests/baselines/reference/classIndexer3.js    |   4 +-
 tests/baselines/reference/classIndexer4.js    |   2 +-
 tests/baselines/reference/classInheritence.js |   4 +-
 tests/baselines/reference/classInsideBlock.js |   2 +-
 .../reference/classIsSubtypeOfBaseType.js     |   6 +-
 .../classMemberInitializerScoping.js          |   4 +-
 .../classMemberInitializerWithLamdaScoping.js |   4 +-
 ...classMemberInitializerWithLamdaScoping2.js |   2 +-
 ...classMemberInitializerWithLamdaScoping3.js |   2 +-
 ...classMemberInitializerWithLamdaScoping4.js |   2 +-
 ...classMemberInitializerWithLamdaScoping5.js |   2 +-
 .../classMemberWithMissingIdentifier.js       |   2 +-
 .../classMemberWithMissingIdentifier2.js      |   2 +-
 .../reference/classMethodWithKeywordName1.js  |   2 +-
 tests/baselines/reference/classOrder1.js      |   2 +-
 tests/baselines/reference/classOrder2.js      |   4 +-
 tests/baselines/reference/classOrderBug.js    |   6 +-
 .../reference/classOverloadForFunction.js     |   2 +-
 .../reference/classOverloadForFunction2.js    |   2 +-
 .../reference/classPropertyAsPrivate.js       |   2 +-
 .../reference/classPropertyAsProtected.js     |   2 +-
 .../classPropertyIsPublicByDefault.js         |   2 +-
 .../reference/classSideInheritance1.js        |   4 +-
 .../reference/classSideInheritance2.js        |   4 +-
 .../reference/classSideInheritance3.js        |   6 +-
 .../reference/classTypeParametersInStatics.js |   2 +-
 tests/baselines/reference/classUpdateTests.js |  36 +--
 .../classWithBaseClassButNoConstructor.js     |  12 +-
 .../reference/classWithConstructors.js        |  12 +-
 .../baselines/reference/classWithEmptyBody.js |   4 +-
 .../reference/classWithMultipleBaseClasses.js |   6 +-
 .../classWithNoConstructorOrBaseClass.js      |   4 +-
 ...hOnlyPublicMembersEquivalentToInterface.js |   2 +-
 ...OnlyPublicMembersEquivalentToInterface2.js |   2 +-
 .../reference/classWithOptionalParameter.js   |   4 +-
 ...ssWithOverloadImplementationOfWrongName.js |   2 +-
 ...sWithOverloadImplementationOfWrongName2.js |   2 +-
 .../classWithPredefinedTypesAsNames.js        |   8 +-
 .../classWithPredefinedTypesAsNames2.js       |   2 +-
 .../reference/classWithPrivateProperty.js     |   2 +-
 .../reference/classWithProtectedProperty.js   |   4 +-
 .../reference/classWithPublicProperty.js      |   2 +-
 .../classWithSemicolonClassElement1.js        |   2 +-
 .../classWithSemicolonClassElement2.js        |   2 +-
 .../reference/classWithStaticMembers.js       |   4 +-
 .../classWithTwoConstructorDefinitions.js     |   4 +-
 .../classWithoutExplicitConstructor.js        |   4 +-
 tests/baselines/reference/classdecl.js        |  20 +-
 tests/baselines/reference/clinterfaces.js     |   8 +-
 .../cloduleAcrossModuleDefinitions.js         |   2 +-
 .../reference/cloduleAndTypeParameters.js     |   4 +-
 .../reference/cloduleSplitAcrossFiles.js      |   2 +-
 .../reference/cloduleStaticMembers.js         |   2 +-
 .../reference/cloduleWithDuplicateMember1.js  |   2 +-
 .../reference/cloduleWithDuplicateMember2.js  |   2 +-
 .../cloduleWithPriorInstantiatedModule.js     |   4 +-
 .../cloduleWithPriorUninstantiatedModule.js   |   4 +-
 .../cloduleWithRecursiveReference.js          |   2 +-
 .../reference/clodulesDerivedClasses.js       |   4 +-
 .../collisionArgumentsClassConstructor.js     |  20 +-
 .../collisionArgumentsClassMethod.js          |   4 +-
 ...lisionCodeGenModuleWithAccessorChildren.js |  10 +-
 ...ionCodeGenModuleWithConstructorChildren.js |   6 +-
 ...ionCodeGenModuleWithMemberClassConflict.js |   6 +-
 ...odeGenModuleWithMemberInterfaceConflict.js |   2 +-
 ...ollisionCodeGenModuleWithMethodChildren.js |   8 +-
 ...ollisionCodeGenModuleWithModuleChildren.js |   2 +-
 ...llisionCodeGenModuleWithModuleReopening.js |   8 +-
 ...collisionCodeGenModuleWithPrivateMember.js |   4 +-
 .../collisionCodeGenModuleWithUnicodeNames.js |   2 +-
 .../collisionExportsRequireAndClass.js        |  24 +-
 ...ionExportsRequireAndInternalModuleAlias.js |   2 +-
 ...quireAndInternalModuleAliasInGlobalFile.js |   2 +-
 .../collisionExportsRequireAndModule.js       |  24 +-
 .../collisionRestParameterClassConstructor.js |  16 +-
 .../collisionRestParameterClassMethod.js      |   4 +-
 .../collisionRestParameterUnderscoreIUsage.js |   2 +-
 ...llisionSuperAndLocalFunctionInAccessors.js |   6 +-
 ...isionSuperAndLocalFunctionInConstructor.js |   6 +-
 .../collisionSuperAndLocalFunctionInMethod.js |   6 +-
 ...ollisionSuperAndLocalFunctionInProperty.js |   4 +-
 .../collisionSuperAndLocalVarInAccessors.js   |   6 +-
 .../collisionSuperAndLocalVarInConstructor.js |   6 +-
 .../collisionSuperAndLocalVarInMethod.js      |   6 +-
 .../collisionSuperAndLocalVarInProperty.js    |   4 +-
 .../collisionSuperAndNameResolution.js        |   4 +-
 .../reference/collisionSuperAndParameter.js   |   6 +-
 .../reference/collisionSuperAndParameter1.js  |   4 +-
 ...perAndPropertyNameAsConstuctorParameter.js |  10 +-
 ...collisionThisExpressionAndClassInGlobal.js |   2 +-
 ...ionThisExpressionAndLocalVarInAccessors.js |   4 +-
 ...nThisExpressionAndLocalVarInConstructor.js |   4 +-
 ...lisionThisExpressionAndLocalVarInMethod.js |   2 +-
 ...sionThisExpressionAndLocalVarInProperty.js |   4 +-
 ...xpressionAndLocalVarWithSuperExperssion.js |   6 +-
 ...ollisionThisExpressionAndModuleInGlobal.js |   2 +-
 ...ollisionThisExpressionAndNameResolution.js |   2 +-
 .../collisionThisExpressionAndParameter.js    |   6 +-
 ...ionAndPropertyNameAsConstuctorParameter.js |   8 +-
 ...ommaOperatorWithSecondOperandObjectType.js |   2 +-
 .../reference/commentBeforeStaticMethod1.js   |   2 +-
 .../reference/commentOnClassAccessor1.js      |   2 +-
 .../reference/commentOnClassAccessor2.js      |   2 +-
 .../reference/commentOnClassMethod1.js        |   2 +-
 .../reference/commentOnSignature1.js          |   2 +-
 .../reference/commentOnStaticMember1.js       |   2 +-
 tests/baselines/reference/commentsClass.js    |  16 +-
 .../reference/commentsClassMembers.js         |   4 +-
 .../reference/commentsCommentParsing.js       |   2 +-
 .../reference/commentsDottedModuleName.js     |   2 +-
 .../reference/commentsExternalModules.js      |   4 +-
 .../reference/commentsExternalModules2.js     |   4 +-
 .../reference/commentsExternalModules3.js     |   4 +-
 .../baselines/reference/commentsFormatting.js |   8 +-
 .../reference/commentsInheritance.js          |   8 +-
 tests/baselines/reference/commentsModules.js  |  18 +-
 .../reference/commentsMultiModuleMultiFile.js |  10 +-
 .../commentsMultiModuleSingleFile.js          |   8 +-
 .../reference/commentsOnReturnStatement1.js   |   2 +-
 .../reference/commentsOnStaticMembers.js      |   2 +-
 .../baselines/reference/commentsOverloads.js  |  12 +-
 .../reference/commentsTypeParameters.js       |   2 +-
 .../reference/commentsdoNotEmitComments.js    |   4 +-
 .../reference/commentsemitComments.js         |   4 +-
 .../commonJSImportAsPrimaryExpression.js      |   2 +-
 .../commonJSImportNotAsPrimaryExpression.js   |   2 +-
 .../comparisonOperatorWithIdenticalObjects.js |  10 +-
 ...ithNoRelationshipObjectsOnCallSignature.js |   6 +-
 ...lationshipObjectsOnConstructorSignature.js |   6 +-
 ...thNoRelationshipObjectsOnIndexSignature.js |   6 +-
 ...nshipObjectsOnInstantiatedCallSignature.js |   6 +-
 ...jectsOnInstantiatedConstructorSignature.js |   6 +-
 ...atorWithNoRelationshipObjectsOnProperty.js |   8 +-
 ...peratorWithSubtypeObjectOnCallSignature.js |   4 +-
 ...WithSubtypeObjectOnConstructorSignature.js |   4 +-
 ...eratorWithSubtypeObjectOnIndexSignature.js |   4 +-
 ...ubtypeObjectOnInstantiatedCallSignature.js |   4 +-
 ...bjectOnInstantiatedConstructorSignature.js |   4 +-
 ...isonOperatorWithSubtypeObjectOnProperty.js |  12 +-
 .../reference/complexClassRelationships.js    |  16 +-
 ...catedGenericRecursiveBaseClassReference.js |   2 +-
 .../baselines/reference/complicatedPrivacy.js |  12 +-
 .../reference/compoundAssignmentLHSIsValue.js |   4 +-
 ...poundExponentiationAssignmentLHSIsValue.js |   4 +-
 .../reference/computedPropertyNames12_ES5.js  |   2 +-
 .../reference/computedPropertyNames13_ES5.js  |   2 +-
 .../reference/computedPropertyNames14_ES5.js  |   2 +-
 .../reference/computedPropertyNames15_ES5.js  |   2 +-
 .../reference/computedPropertyNames16_ES5.js  |   2 +-
 .../reference/computedPropertyNames17_ES5.js  |   2 +-
 .../reference/computedPropertyNames21_ES5.js  |   2 +-
 .../reference/computedPropertyNames22_ES5.js  |   2 +-
 .../reference/computedPropertyNames23_ES5.js  |   2 +-
 .../reference/computedPropertyNames24_ES5.js  |   4 +-
 .../reference/computedPropertyNames25_ES5.js  |   4 +-
 .../reference/computedPropertyNames26_ES5.js  |   4 +-
 .../reference/computedPropertyNames27_ES5.js  |   4 +-
 .../reference/computedPropertyNames28_ES5.js  |   4 +-
 .../reference/computedPropertyNames29_ES5.js  |   2 +-
 .../reference/computedPropertyNames2_ES5.js   |   2 +-
 .../reference/computedPropertyNames30_ES5.js  |   4 +-
 .../reference/computedPropertyNames31_ES5.js  |   4 +-
 .../reference/computedPropertyNames32_ES5.js  |   2 +-
 .../reference/computedPropertyNames33_ES5.js  |   2 +-
 .../reference/computedPropertyNames34_ES5.js  |   2 +-
 .../reference/computedPropertyNames36_ES5.js  |   6 +-
 .../reference/computedPropertyNames37_ES5.js  |   6 +-
 .../reference/computedPropertyNames38_ES5.js  |   6 +-
 .../reference/computedPropertyNames39_ES5.js  |   6 +-
 .../reference/computedPropertyNames3_ES5.js   |   2 +-
 .../reference/computedPropertyNames40_ES5.js  |   6 +-
 .../reference/computedPropertyNames41_ES5.js  |   6 +-
 .../reference/computedPropertyNames42_ES5.js  |   6 +-
 .../reference/computedPropertyNames43_ES5.js  |   8 +-
 .../reference/computedPropertyNames44_ES5.js  |   8 +-
 .../reference/computedPropertyNames45_ES5.js  |   8 +-
 ...mputedPropertyNamesDeclarationEmit1_ES5.js |   2 +-
 ...mputedPropertyNamesDeclarationEmit2_ES5.js |   2 +-
 .../computedPropertyNamesOnOverloads_ES5.js   |   2 +-
 .../computedPropertyNamesSourceMap1_ES5.js    |   2 +-
 ...dPropertyNamesSourceMap1_ES5.sourcemap.txt |   2 +-
 .../reference/concatClassAndString.js         |   2 +-
 ...onditionalOperatorConditionIsObjectType.js |   2 +-
 .../conditionalOperatorWithIdenticalBCT.js    |   6 +-
 .../conditionalOperatorWithoutIdenticalBCT.js |   6 +-
 .../reference/conflictMarkerTrivia1.js        |   2 +-
 .../reference/conflictMarkerTrivia2.js        |   2 +-
 ...nstDeclarationShadowedByVarDeclaration3.js |   2 +-
 .../reference/constEnumMergingWithValues2.js  |   2 +-
 .../reference/constantOverloadFunction.js     |   8 +-
 .../constantOverloadFunctionNoSubtypeError.js |   8 +-
 ...nstraintCheckInGenericBaseTypeReference.js |  10 +-
 .../constraintSatisfactionWithAny.js          |   6 +-
 .../constraintSatisfactionWithEmptyObject.js  |   4 +-
 ...straintsThatReferenceOtherContstraints1.js |   4 +-
 .../constraintsUsedInPrototypeProperty.js     |   2 +-
 ...uctSignatureAssignabilityInInheritance2.js |   8 +-
 ...uctSignatureAssignabilityInInheritance3.js |   8 +-
 ...uctSignatureAssignabilityInInheritance4.js |   8 +-
 ...uctSignatureAssignabilityInInheritance5.js |   8 +-
 ...uctSignatureAssignabilityInInheritance6.js |   8 +-
 ...eWithAccessibilityModifiersOnParameters.js |   6 +-
 ...WithAccessibilityModifiersOnParameters2.js |   6 +-
 ...nstructSignaturesWithIdenticalOverloads.js |   4 +-
 .../constructSignaturesWithOverloads.js       |   4 +-
 .../constructSignaturesWithOverloads2.js      |   4 +-
 ...WithOverloadsThatDifferOnlyByReturnType.js |   4 +-
 .../constructorArgWithGenericCallSignature.js |   2 +-
 tests/baselines/reference/constructorArgs.js  |   4 +-
 .../reference/constructorArgsErrors1.js       |   2 +-
 .../reference/constructorArgsErrors2.js       |   2 +-
 .../reference/constructorArgsErrors3.js       |   2 +-
 .../reference/constructorArgsErrors4.js       |   2 +-
 .../reference/constructorArgsErrors5.js       |   2 +-
 ...constructorDefaultValuesReferencingThis.js |   6 +-
 ...uctorFunctionTypeIsAssignableToBaseType.js |   6 +-
 ...ctorFunctionTypeIsAssignableToBaseType2.js |   6 +-
 .../constructorHasPrototypeProperty.js        |   8 +-
 ...structorImplementationWithDefaultValues.js |   6 +-
 ...tructorImplementationWithDefaultValues2.js |   6 +-
 ...constructorInvocationWithTooFewTypeArgs.js |   2 +-
 .../reference/constructorOverloads1.js        |   2 +-
 .../reference/constructorOverloads2.js        |   4 +-
 .../reference/constructorOverloads3.js        |   2 +-
 .../reference/constructorOverloads8.js        |   4 +-
 .../constructorOverloadsWithDefaultValues.js  |   4 +-
 ...structorOverloadsWithOptionalParameters.js |   4 +-
 .../constructorParameterProperties.js         |   4 +-
 .../constructorParameterProperties2.js        |   8 +-
 .../constructorParameterShadowsOuterScopes.js |   4 +-
 ...tructorParametersInVariableDeclarations.js |   4 +-
 ...adowExternalNamesInVariableDeclarations.js |   4 +-
 .../constructorReturningAPrimitive.js         |   4 +-
 .../constructorReturnsInvalidType.js          |   2 +-
 .../reference/constructorStaticParamName.js   |   2 +-
 .../constructorStaticParamNameErrors.js       |   2 +-
 ...nstructorWithAssignableReturnExpression.js |  10 +-
 .../constructorWithExpressionLessReturn.js    |   8 +-
 ...constructorWithIncompleteTypeAnnotation.js |  12 +-
 .../constructorsWithSpecializedSignatures.js  |   4 +-
 .../contextualTypeAppliedToVarArgs.js         |   2 +-
 .../reference/contextualTypeWithTuple.js      |   4 +-
 tests/baselines/reference/contextualTyping.js |   6 +-
 .../reference/contextualTyping.sourcemap.txt  |   6 +-
 .../baselines/reference/contextualTyping10.js |   2 +-
 .../baselines/reference/contextualTyping11.js |   2 +-
 .../baselines/reference/contextualTyping12.js |   2 +-
 .../baselines/reference/contextualTyping14.js |   2 +-
 .../baselines/reference/contextualTyping15.js |   2 +-
 .../baselines/reference/contextualTyping3.js  |   2 +-
 .../baselines/reference/contextualTyping4.js  |   2 +-
 .../baselines/reference/contextualTyping5.js  |   2 +-
 .../contextualTypingArrayOfLambdas.js         |   6 +-
 ...contextualTypingOfConditionalExpression.js |   6 +-
 ...ontextualTypingOfConditionalExpression2.js |   6 +-
 ...TypedClassExpressionMethodDeclaration01.js |   6 +-
 ...TypedClassExpressionMethodDeclaration02.js |   6 +-
 .../baselines/reference/convertKeywordsYes.js |  30 +--
 tests/baselines/reference/covariance1.js      |   2 +-
 .../crashInresolveReturnStatement.js          |   6 +-
 ...urcePropertyIsRelatableToTargetProperty.js |   4 +-
 ...rashIntypeCheckObjectCreationExpression.js |   2 +-
 .../reference/crashOnMethodSignatures.js      |   2 +-
 .../reference/crashRegressionTest.js          |   4 +-
 tests/baselines/reference/createArray.js      |   2 +-
 .../baselines/reference/declFileAccessors.js  |   4 +-
 .../declFileAliasUseBeforeDeclaration.js      |   2 +-
 .../reference/declFileClassExtendsNull.js     |   2 +-
 .../declFileClassWithIndexSignature.js        |   2 +-
 ...assWithStaticMethodReturningConstructor.js |   2 +-
 .../reference/declFileConstructors.js         |  32 +--
 .../reference/declFileExportImportChain.js    |   2 +-
 .../reference/declFileExportImportChain2.js   |   2 +-
 ...declFileForClassWithMultipleBaseClasses.js |   6 +-
 ...leForClassWithPrivateOverloadedFunction.js |   2 +-
 .../declFileForFunctionTypeAsTypeParameter.js |   4 +-
 .../reference/declFileForTypeParameters.js    |   2 +-
 ...ileGenericClassWithGenericExtendedClass.js |   6 +-
 .../reference/declFileGenericType.js          |   8 +-
 .../reference/declFileGenericType2.js         |   4 +-
 .../declFileImportChainInExportAssignment.js  |   2 +-
 ...eclFileImportedTypeUseInTypeArgPosition.js |   2 +-
 .../reference/declFileInternalAliases.js      |   2 +-
 tests/baselines/reference/declFileMethods.js  |   4 +-
 ...ModuleAssignmentInObjectLiteralProperty.js |   2 +-
 .../reference/declFileModuleContinuation.js   |   2 +-
 .../declFileModuleWithPropertyOfTypeModule.js |   2 +-
 .../declFilePrivateMethodOverloads.js         |   2 +-
 .../reference/declFilePrivateStatic.js        |   2 +-
 .../declFileTypeAnnotationArrayType.js        |   8 +-
 .../declFileTypeAnnotationParenType.js        |   2 +-
 .../declFileTypeAnnotationTupleType.js        |   8 +-
 .../declFileTypeAnnotationTypeAlias.js        |   6 +-
 .../declFileTypeAnnotationTypeLiteral.js      |   6 +-
 .../declFileTypeAnnotationTypeQuery.js        |   8 +-
 .../declFileTypeAnnotationTypeReference.js    |   8 +-
 .../declFileTypeAnnotationUnionType.js        |   8 +-
 ...eTypeAnnotationVisibilityErrorAccessors.js |   8 +-
 ...ationVisibilityErrorParameterOfFunction.js |   6 +-
 ...tionVisibilityErrorReturnTypeOfFunction.js |   6 +-
 ...eTypeAnnotationVisibilityErrorTypeAlias.js |  10 +-
 ...ypeAnnotationVisibilityErrorTypeLiteral.js |   4 +-
 ...ationVisibilityErrorVariableDeclaration.js |   6 +-
 .../reference/declFileTypeofClass.js          |   4 +-
 .../declFileTypeofInAnonymousType.js          |   2 +-
 ...lictingWithClassReferredByExtendsClause.js |   4 +-
 ...dsClauseThatHasItsContainerNameConflict.js |   4 +-
 ...rnalModuleNameConflictsInExtendsClause1.js |   2 +-
 ...rnalModuleNameConflictsInExtendsClause2.js |   2 +-
 ...rnalModuleNameConflictsInExtendsClause3.js |   2 +-
 tests/baselines/reference/declInput-2.js      |   6 +-
 tests/baselines/reference/declInput.js        |   2 +-
 tests/baselines/reference/declInput3.js       |   2 +-
 tests/baselines/reference/declInput4.js       |   6 +-
 ...ionEmitDestructuringParameterProperties.js |   6 +-
 ...eclarationEmitDestructuringPrivacyError.js |   2 +-
 .../declarationEmitDetachedComment1.js        |   6 +-
 .../declarationEmitDetachedComment2.js        |   6 +-
 ...ationEmitImportInExportAssignmentModule.js |   2 +-
 .../declarationEmit_nameConflicts.js          |   8 +-
 .../declarationEmit_nameConflicts2.js         |   2 +-
 .../declarationEmit_nameConflicts3.js         |   4 +-
 .../declarationEmit_protectedMembers.js       |   8 +-
 .../declarationFileOverwriteError.js          |   2 +-
 .../declarationFileOverwriteErrorWithOut.js   |   2 +-
 tests/baselines/reference/declarationFiles.js |   8 +-
 .../reference/declareDottedExtend.js          |   4 +-
 ...ifierAsBeginningOfStatementExpression01.js |   2 +-
 .../reference/decoratorCallGeneric.js         |   2 +-
 .../decoratorChecksFunctionBodies.js          |   2 +-
 ...ratorInstantiateModulesInFunctionBodies.js |   2 +-
 .../baselines/reference/decoratorMetadata.js  |   4 +-
 ...taForMethodWithNoReturnTypeAnnotation01.js |   2 +-
 .../decoratorMetadataOnInferredType.js        |   4 +-
 .../decoratorMetadataWithConstructorType.js   |   4 +-
 ...adataWithImportDeclarationNameCollision.js |   4 +-
 ...dataWithImportDeclarationNameCollision2.js |   4 +-
 ...dataWithImportDeclarationNameCollision3.js |   4 +-
 ...dataWithImportDeclarationNameCollision4.js |   4 +-
 ...dataWithImportDeclarationNameCollision5.js |   4 +-
 ...dataWithImportDeclarationNameCollision6.js |   4 +-
 ...dataWithImportDeclarationNameCollision7.js |   4 +-
 ...dataWithImportDeclarationNameCollision8.js |   4 +-
 .../baselines/reference/decoratorOnClass1.js  |   2 +-
 .../baselines/reference/decoratorOnClass2.js  |   2 +-
 .../baselines/reference/decoratorOnClass3.js  |   2 +-
 .../baselines/reference/decoratorOnClass4.js  |   2 +-
 .../baselines/reference/decoratorOnClass5.js  |   2 +-
 .../baselines/reference/decoratorOnClass8.js  |   2 +-
 .../reference/decoratorOnClassAccessor1.js    |   2 +-
 .../reference/decoratorOnClassAccessor2.js    |   2 +-
 .../reference/decoratorOnClassAccessor3.js    |   2 +-
 .../reference/decoratorOnClassAccessor4.js    |   2 +-
 .../reference/decoratorOnClassAccessor5.js    |   2 +-
 .../reference/decoratorOnClassAccessor6.js    |   2 +-
 .../reference/decoratorOnClassConstructor1.js |   2 +-
 .../decoratorOnClassConstructorParameter1.js  |   2 +-
 .../decoratorOnClassConstructorParameter4.js  |   2 +-
 .../reference/decoratorOnClassMethod1.js      |   2 +-
 .../reference/decoratorOnClassMethod10.js     |   2 +-
 .../reference/decoratorOnClassMethod11.js     |   2 +-
 .../reference/decoratorOnClassMethod12.js     |   4 +-
 .../reference/decoratorOnClassMethod2.js      |   2 +-
 .../reference/decoratorOnClassMethod3.js      |   2 +-
 .../reference/decoratorOnClassMethod8.js      |   2 +-
 .../decoratorOnClassMethodParameter1.js       |   2 +-
 .../reference/decoratorOnClassProperty1.js    |   2 +-
 .../reference/decoratorOnClassProperty10.js   |   2 +-
 .../reference/decoratorOnClassProperty11.js   |   2 +-
 .../reference/decoratorOnClassProperty2.js    |   2 +-
 .../reference/decoratorOnClassProperty3.js    |   2 +-
 .../reference/decoratorOnClassProperty6.js    |   2 +-
 .../reference/decoratorOnClassProperty7.js    |   2 +-
 .../decrementOperatorWithAnyOtherType.js      |   2 +-
 ...eratorWithAnyOtherTypeInvalidOperations.js |   2 +-
 .../decrementOperatorWithNumberType.js        |   2 +-
 ...OperatorWithNumberTypeInvalidOperations.js |   2 +-
 ...ementOperatorWithUnsupportedBooleanType.js |   2 +-
 ...rementOperatorWithUnsupportedStringType.js |   2 +-
 .../reference/defaultArgsInOverloads.js       |   2 +-
 .../reference/defaultExportsCannotMerge02.js  |   2 +-
 .../reference/defaultExportsCannotMerge03.js  |   2 +-
 .../baselines/reference/defaultIndexProps1.js |   2 +-
 .../baselines/reference/defaultIndexProps2.js |   2 +-
 .../defaultValueInConstructorOverload1.js     |   2 +-
 .../deleteOperatorInvalidOperations.js        |   2 +-
 .../deleteOperatorWithAnyOtherType.js         |   2 +-
 .../deleteOperatorWithBooleanType.js          |   2 +-
 .../reference/deleteOperatorWithNumberType.js |   2 +-
 .../reference/deleteOperatorWithStringType.js |   2 +-
 .../reference/dependencyViaImportAlias.js     |   2 +-
 ...derivedClassConstructorWithoutSuperCall.js |  12 +-
 ...ClassFunctionOverridesBaseClassAccessor.js |   4 +-
 .../derivedClassIncludesInheritedMembers.js   |   8 +-
 ...idesIndexersWithAssignmentCompatibility.js |   8 +-
 .../derivedClassOverridesPrivateFunction1.js  |   4 +-
 .../derivedClassOverridesPrivates.js          |   8 +-
 .../derivedClassOverridesProtectedMembers.js  |   4 +-
 .../derivedClassOverridesProtectedMembers2.js |   8 +-
 .../derivedClassOverridesProtectedMembers3.js |  22 +-
 .../derivedClassOverridesProtectedMembers4.js |   6 +-
 .../derivedClassOverridesPublicMembers.js     |   8 +-
 .../derivedClassOverridesWithoutSubtype.js    |   8 +-
 .../derivedClassParameterProperties.js        |  24 +-
 ...dClassSuperCallsInNonConstructorMembers.js |   4 +-
 .../derivedClassSuperCallsWithThisArg.js      |  10 +-
 .../reference/derivedClassTransitivity.js     |   6 +-
 .../reference/derivedClassTransitivity2.js    |   6 +-
 .../reference/derivedClassTransitivity3.js    |   6 +-
 .../reference/derivedClassTransitivity4.js    |   6 +-
 .../reference/derivedClassWithAny.js          |   6 +-
 ...ivateInstanceShadowingProtectedInstance.js |   4 +-
 ...hPrivateInstanceShadowingPublicInstance.js |   4 +-
 ...thPrivateStaticShadowingProtectedStatic.js |   4 +-
 ...sWithPrivateStaticShadowingPublicStatic.js |   4 +-
 .../derivedClassWithoutExplicitConstructor.js |   8 +-
 ...derivedClassWithoutExplicitConstructor2.js |   8 +-
 ...derivedClassWithoutExplicitConstructor3.js |  12 +-
 tests/baselines/reference/derivedClasses.js   |   6 +-
 .../reference/derivedGenericClassWithAny.js   |   6 +-
 ...sesHiddenBaseCallViaSuperPropertyAccess.js |   4 +-
 ...edTypeCallingBaseImplWithOptionalParams.js |   2 +-
 .../derivedTypeDoesNotRequireExtendsClause.js |   6 +-
 .../destructuringParameterDeclaration1ES5.js  |   4 +-
 .../destructuringParameterDeclaration2.js     |   2 +-
 .../destructuringParameterDeclaration4.js     |   2 +-
 .../destructuringParameterDeclaration5.js     |   8 +-
 .../destructuringParameterProperties1.js      |   6 +-
 .../destructuringParameterProperties2.js      |   2 +-
 .../destructuringParameterProperties3.js      |   2 +-
 .../destructuringParameterProperties5.js      |   2 +-
 .../destructuringWithGenericParameter.js      |   2 +-
 .../destructuringWithNewExpression.js         |   2 +-
 .../detachedCommentAtStartOfConstructor1.js   |   2 +-
 .../detachedCommentAtStartOfConstructor2.js   |   2 +-
 .../detachedCommentAtStartOfFunctionBody1.js  |   2 +-
 .../detachedCommentAtStartOfFunctionBody2.js  |   2 +-
 ...detachedCommentAtStartOfLambdaFunction1.js |   2 +-
 ...detachedCommentAtStartOfLambdaFunction2.js |   2 +-
 .../reference/differentTypesWithSameName.js   |   4 +-
 .../directDependenceBetweenTypeAliases.js     |   4 +-
 .../disallowLineTerminatorBeforeArrow.js      |   2 +-
 ...mitDetachedCommentsAtStartOfConstructor.js |   8 +-
 .../doNotEmitPinnedCommentOnNotEmittedNode.js |   2 +-
 ...oNotEmitPinnedCommentOnNotEmittedNodets.js |   2 +-
 .../reference/dottedSymbolResolution1.js      |   2 +-
 .../reference/downlevelLetConst16.js          |   4 +-
 .../reference/duplicateAnonymousInners1.js    |   6 +-
 .../duplicateAnonymousModuleClasses.js        |  12 +-
 .../reference/duplicateClassElements.js       |   2 +-
 .../duplicateConstructorOverloadSignature.js  |   2 +-
 .../duplicateConstructorOverloadSignature2.js |   2 +-
 .../reference/duplicateExportAssignments.js   |   4 +-
 ...ateIdentifiersAcrossContainerBoundaries.js |  10 +-
 ...uplicateIdentifiersAcrossFileBoundaries.js |  10 +-
 .../reference/duplicateLocalVariable1.js      |   4 +-
 .../reference/duplicateLocalVariable2.js      |   4 +-
 .../reference/duplicateNumericIndexers.js     |   2 +-
 .../reference/duplicatePropertyNames.js       |   2 +-
 .../reference/duplicateStringIndexers.js      |   2 +-
 .../duplicateSymbolsExportMatching.js         |   2 +-
 .../reference/duplicateTypeParameters2.js     |   4 +-
 .../reference/duplicateVariablesByScope.js    |   2 +-
 tests/baselines/reference/elaboratedErrors.js |   2 +-
 .../emitArrowFunctionWhenUsingArguments12.js  |   2 +-
 .../reference/emitDefaultParametersMethod.js  |   6 +-
 .../reference/emitMemberAccessExpression.js   |   4 +-
 .../reference/emitRestParametersMethod.js     |   4 +-
 .../reference/emitThisInSuperMethodCall.js    |   4 +-
 .../reference/emptyGenericParamList.js        |   2 +-
 tests/baselines/reference/emptyModuleName.js  |   2 +-
 .../reference/emptyTypeArgumentListWithNew.js |   2 +-
 .../baselines/reference/enumAssignability.js  |   2 +-
 .../enumAssignabilityInInheritance.js         |   6 +-
 .../reference/enumAssignmentCompat.js         |   2 +-
 .../reference/enumAssignmentCompat2.js        |   2 +-
 .../reference/enumGenericTypeClash.js         |   2 +-
 .../enumIsNotASubtypeOfAnythingButNumber.js   |   6 +-
 ...rorForwardReferenceForwadingConstructor.js |   4 +-
 .../errorRecoveryInClassDeclaration.js        |   2 +-
 tests/baselines/reference/errorSuperCalls.js  |  10 +-
 .../reference/errorSuperPropertyAccess.js     |  10 +-
 tests/baselines/reference/errorSupression1.js |   2 +-
 .../reference/errorsInGenericTypeReference.js |  16 +-
 tests/baselines/reference/es3-amd.js          |   2 +-
 .../reference/es3-declaration-amd.js          |   2 +-
 .../baselines/reference/es3-sourcemap-amd.js  |   2 +-
 .../reference/es3-sourcemap-amd.sourcemap.txt |   2 +-
 .../reference/es3defaultAliasIsQuoted.js      |   2 +-
 tests/baselines/reference/es5-amd.js          |   2 +-
 tests/baselines/reference/es5-commonjs.js     |   2 +-
 tests/baselines/reference/es5-commonjs4.js    |   2 +-
 .../reference/es5-declaration-amd.js          |   2 +-
 tests/baselines/reference/es5-souremap-amd.js |   2 +-
 .../reference/es5-souremap-amd.sourcemap.txt  |   2 +-
 tests/baselines/reference/es5-system.js       |   2 +-
 tests/baselines/reference/es5-umd.js          |   2 +-
 tests/baselines/reference/es5-umd2.js         |   2 +-
 tests/baselines/reference/es5-umd3.js         |   2 +-
 tests/baselines/reference/es5-umd4.js         |   2 +-
 .../es5ExportDefaultClassDeclaration.js       |   2 +-
 .../es5ExportDefaultClassDeclaration2.js      |   2 +-
 .../es5ExportDefaultClassDeclaration3.js      |   2 +-
 .../baselines/reference/es5ExportEqualsDts.js |   2 +-
 .../es5ModuleInternalNamedImports.js          |   2 +-
 .../reference/es5ModuleWithModuleGenAmd.js    |   2 +-
 .../es5ModuleWithModuleGenCommonjs.js         |   2 +-
 .../es5ModuleWithoutModuleGenTarget.js        |   2 +-
 tests/baselines/reference/es5andes6module.js  |   2 +-
 .../reference/es6ClassSuperCodegenBug.js      |   4 +-
 tests/baselines/reference/es6ClassTest.js     |   4 +-
 tests/baselines/reference/es6ClassTest2.js    |  24 +-
 tests/baselines/reference/es6ClassTest3.js    |   2 +-
 tests/baselines/reference/es6ClassTest5.js    |   4 +-
 tests/baselines/reference/es6ClassTest7.js    |   2 +-
 tests/baselines/reference/es6ClassTest8.js    |   6 +-
 tests/baselines/reference/es6DeclOrdering.js  |   2 +-
 .../baselines/reference/es6ExportAllInEs5.js  |   2 +-
 .../reference/es6ExportClauseInEs5.js         |   2 +-
 ...ExportClauseWithoutModuleSpecifierInEs5.js |   2 +-
 .../reference/es6ImportDefaultBindingDts.js   |   2 +-
 ...efaultBindingFollowedWithNamedImportDts.js |  12 +-
 ...faultBindingFollowedWithNamedImportDts1.js |   2 +-
 ...tBindingFollowedWithNamespaceBindingDts.js |   2 +-
 ...BindingFollowedWithNamespaceBindingDts1.js |   2 +-
 .../reference/es6ImportNameSpaceImportDts.js  |   2 +-
 .../reference/es6ImportNamedImportDts.js      |  28 +--
 ...rtNamedImportInIndirectExportAssignment.js |   2 +-
 .../es6ImportNamedImportWithTypesAndValues.js |   4 +-
 tests/baselines/reference/es6MemberScoping.js |   4 +-
 .../baselines/reference/escapedIdentifiers.js |   8 +-
 .../reference/everyTypeAssignableToAny.js     |   2 +-
 .../everyTypeWithAnnotationAndInitializer.js  |   6 +-
 ...TypeWithAnnotationAndInvalidInitializer.js |   8 +-
 .../reference/everyTypeWithInitializer.js     |   6 +-
 .../baselines/reference/exportAlreadySeen.js  |   2 +-
 .../reference/exportAssignClassAndModule.js   |   2 +-
 .../reference/exportAssignNonIdentifier.js    |   2 +-
 .../exportAssignmentAndDeclaration.js         |   2 +-
 .../reference/exportAssignmentClass.js        |   2 +-
 .../exportAssignmentConstrainedGenericType.js |   2 +-
 .../reference/exportAssignmentGenericType.js  |   2 +-
 .../exportAssignmentOfGenericType1.js         |   4 +-
 .../exportAssignmentTopLevelClodule.js        |   2 +-
 .../reference/exportAssignmentWithExports.js  |   4 +-
 tests/baselines/reference/exportCodeGen.js    |   4 +-
 .../exportDeclarationInInternalModule.js      |   8 +-
 tests/baselines/reference/exportImport.js     |   2 +-
 .../baselines/reference/exportImportAlias.js  |   6 +-
 .../reference/exportImportAndClodule.js       |   2 +-
 .../exportNonInitializedVariablesAMD.js       |   4 +-
 .../exportNonInitializedVariablesCommonJS.js  |   4 +-
 .../exportNonInitializedVariablesSystem.js    |   4 +-
 .../exportNonInitializedVariablesUMD.js       |   4 +-
 .../reference/exportNonVisibleType.js         |   4 +-
 .../baselines/reference/exportPrivateType.js  |   4 +-
 .../reference/exportStarFromEmptyModule.js    |   4 +-
 tests/baselines/reference/exportVisibility.js |   2 +-
 .../exportingContainingVisibleType.js         |   2 +-
 .../reference/exportsAndImports1-amd.js       |   2 +-
 .../baselines/reference/exportsAndImports1.js |   2 +-
 .../reference/exportsAndImports3-amd.js       |   2 +-
 .../baselines/reference/exportsAndImports3.js |   2 +-
 tests/baselines/reference/extBaseClass1.js    |   8 +-
 tests/baselines/reference/extBaseClass2.js    |   4 +-
 .../extendAndImplementTheSameBaseType.js      |   4 +-
 .../extendAndImplementTheSameBaseType2.js     |   4 +-
 .../extendBaseClassBeforeItsDeclared.js       |   4 +-
 .../extendClassExpressionFromModule.js        |   4 +-
 .../extendConstructSignatureInInterface.js    |   2 +-
 .../reference/extendNonClassSymbol1.js        |   4 +-
 .../reference/extendNonClassSymbol2.js        |   2 +-
 ...xtendingClassFromAliasAndUsageInIndexer.js |   6 +-
 .../reference/extendsClauseAlreadySeen.js     |   4 +-
 .../reference/extendsClauseAlreadySeen2.js    |   4 +-
 tests/baselines/reference/externModule.js     |   2 +-
 .../reference/externalModuleAssignToVar.js    |   6 +-
 .../externalModuleExportingGenericClass.js    |   2 +-
 .../reference/externalModuleQualification.js  |   4 +-
 tests/baselines/reference/fatArrowSelf.js     |   4 +-
 .../reference/fieldAndGetterWithSameName.js   |   2 +-
 ...ilesEmittingIntoSameOutputWithOutOption.js |   2 +-
 .../fillInMissingTypeArgsOnConstructCalls.js  |   2 +-
 tests/baselines/reference/fluentClasses.js    |   6 +-
 tests/baselines/reference/for-inStatements.js |   6 +-
 .../reference/for-inStatementsInvalid.js      |   4 +-
 tests/baselines/reference/forStatements.js    |   6 +-
 .../forStatementsMultipleInvalidDecl.js       |   8 +-
 tests/baselines/reference/forgottenNew.js     |   2 +-
 tests/baselines/reference/funClodule.js       |   2 +-
 .../functionAndPropertyNameConflict.js        |   2 +-
 .../reference/functionArgShadowing.js         |   6 +-
 tests/baselines/reference/functionCall5.js    |   2 +-
 tests/baselines/reference/functionCall7.js    |   2 +-
 .../functionConstraintSatisfaction.js         |   4 +-
 .../functionConstraintSatisfaction2.js        |   4 +-
 .../functionConstraintSatisfaction3.js        |   4 +-
 ...ctionExpressionAndLambdaMatchesFunction.js |   2 +-
 .../functionExpressionContextualTyping1.js    |   4 +-
 .../reference/functionImplementationErrors.js |   8 +-
 .../reference/functionImplementations.js      |   8 +-
 .../reference/functionLiteralForOverloads2.js |   4 +-
 .../reference/functionOverloadErrors.js       |   2 +-
 .../baselines/reference/functionOverloads5.js |   2 +-
 .../baselines/reference/functionOverloads6.js |   2 +-
 .../baselines/reference/functionOverloads7.js |   2 +-
 .../reference/functionOverloadsOutOfOrder.js  |   4 +-
 ...tionOverloadsRecursiveGenericReturnType.js |   4 +-
 .../reference/functionSubtypingOfVarArgs.js   |   4 +-
 .../reference/functionSubtypingOfVarArgs2.js  |   4 +-
 .../reference/functionWithSameNameAsField.js  |   2 +-
 .../reference/functionsInClassExpressions.js  |   2 +-
 ...nsMissingReturnStatementsAndExpressions.js |   2 +-
 tests/baselines/reference/fuzzy.js            |   2 +-
 .../reference/generatedContextualTyping.js    | 222 +++++++++---------
 .../generativeRecursionWithTypeOf.js          |   2 +-
 .../genericArrayWithoutTypeAnnotation.js      |   2 +-
 .../genericAssignmentCompatWithInterfaces1.js |   2 +-
 .../genericBaseClassLiteralProperty.js        |   4 +-
 .../genericBaseClassLiteralProperty2.js       |   6 +-
 .../genericCallTypeArgumentInference.js       |   2 +-
 ...allWithConstraintsTypeArgumentInference.js |   8 +-
 .../genericCallWithFixedArguments.js          |   4 +-
 .../genericCallWithFunctionTypedArguments4.js |   4 +-
 .../genericCallWithObjectTypeArgs.js          |   6 +-
 .../genericCallWithObjectTypeArgs2.js         |   6 +-
 ...ricCallWithObjectTypeArgsAndConstraints.js |   6 +-
 ...icCallWithObjectTypeArgsAndConstraints2.js |   4 +-
 ...icCallWithObjectTypeArgsAndConstraints3.js |   6 +-
 ...icCallWithObjectTypeArgsAndConstraints4.js |   4 +-
 ...icCallWithObjectTypeArgsAndConstraints5.js |   4 +-
 .../genericCallbacksAndClassHierarchy.js      |   8 +-
 .../reference/genericCallsWithoutParens.js    |   2 +-
 .../genericClassExpressionInFunction.js       |  16 +-
 ...entingGenericInterfaceFromAnotherModule.js |   2 +-
 ...sInheritsConstructorFromNonGenericClass.js |   6 +-
 ...cClassPropertyInheritanceSpecialization.js |   6 +-
 .../reference/genericClassStaticMethod.js     |   4 +-
 ...icClassWithFunctionTypedMemberArguments.js |  10 +-
 ...icClassWithObjectTypeArgsAndConstraints.js |  10 +-
 .../genericClassWithStaticFactory.js          |   4 +-
 ...nericClassWithStaticsUsingTypeArguments.js |   2 +-
 tests/baselines/reference/genericClasses0.js  |   2 +-
 tests/baselines/reference/genericClasses1.js  |   2 +-
 tests/baselines/reference/genericClasses2.js  |   2 +-
 tests/baselines/reference/genericClasses3.js  |   4 +-
 tests/baselines/reference/genericClasses4.js  |   2 +-
 .../reference/genericClassesInModule.js       |   4 +-
 .../reference/genericClassesInModule2.js      |   4 +-
 .../reference/genericCloduleInModule.js       |   2 +-
 .../reference/genericCloduleInModule2.js      |   2 +-
 .../reference/genericCloneReturnTypes.js      |   2 +-
 .../reference/genericCloneReturnTypes2.js     |   2 +-
 .../baselines/reference/genericConstraint1.js |   2 +-
 .../baselines/reference/genericConstraint2.js |   2 +-
 .../reference/genericConstraintDeclaration.js |   2 +-
 ...genericConstraintOnExtendedBuiltinTypes.js |   4 +-
 ...enericConstraintOnExtendedBuiltinTypes2.js |   4 +-
 .../genericConstructExpressionWithoutArgs.js  |   4 +-
 .../genericDerivedTypeWithSpecializedBase.js  |   4 +-
 .../genericDerivedTypeWithSpecializedBase2.js |   4 +-
 ...genericFunctionsWithOptionalParameters3.js |   2 +-
 tests/baselines/reference/genericGetter.js    |   2 +-
 tests/baselines/reference/genericGetter2.js   |   4 +-
 tests/baselines/reference/genericGetter3.js   |   4 +-
 .../baselines/reference/genericImplements.js  |  10 +-
 .../baselines/reference/genericInstanceOf.js  |   2 +-
 .../genericInterfaceImplementation.js         |   2 +-
 .../genericInterfacesWithoutTypeArguments.js  |   2 +-
 .../reference/genericMemberFunction.js        |   6 +-
 ...ricMergedDeclarationUsingTypeParameter2.js |   2 +-
 .../genericObjectCreationWithoutTypeArgs.js   |   2 +-
 .../reference/genericObjectLitReturnType.js   |   2 +-
 .../reference/genericOfACloduleType1.js       |   6 +-
 .../reference/genericOfACloduleType2.js       |   6 +-
 .../reference/genericOverloadSignatures.js    |   2 +-
 .../reference/genericPrototypeProperty.js     |   2 +-
 .../reference/genericPrototypeProperty2.js    |   8 +-
 .../reference/genericPrototypeProperty3.js    |   8 +-
 ...ericRecursiveImplicitConstructorErrors2.js |   4 +-
 ...ericRecursiveImplicitConstructorErrors3.js |   6 +-
 .../reference/genericReturnTypeFromGetter1.js |   2 +-
 .../genericReversingTypeParameters.js         |   2 +-
 .../genericReversingTypeParameters2.js        |   2 +-
 .../reference/genericSpecializations1.js      |   6 +-
 .../reference/genericSpecializations2.js      |   8 +-
 .../reference/genericSpecializations3.js      |   8 +-
 .../reference/genericStaticAnyTypeFunction.js |   2 +-
 .../reference/genericTypeAssertions1.js       |   2 +-
 .../reference/genericTypeAssertions2.js       |   4 +-
 .../reference/genericTypeAssertions4.js       |   6 +-
 .../reference/genericTypeAssertions6.js       |   4 +-
 .../reference/genericTypeConstraints.js       |   8 +-
 ...genericTypeReferenceWithoutTypeArgument.js |  10 +-
 ...enericTypeReferenceWithoutTypeArgument2.js |   4 +-
 .../genericTypeReferencesRequireTypeArgs.js   |   2 +-
 .../genericTypeUsedWithoutTypeArguments1.js   |   2 +-
 .../genericTypeWithCallableMembers.js         |   2 +-
 .../genericTypeWithNonGenericBaseMisMatch.js  |   2 +-
 .../reference/genericWithCallSignatures1.js   |   2 +-
 .../genericWithIndexerOfTypeParameterType1.js |   2 +-
 .../genericWithIndexerOfTypeParameterType2.js |   8 +-
 .../genericWithOpenTypeParameters1.js         |   2 +-
 tests/baselines/reference/generics3.js        |   2 +-
 tests/baselines/reference/generics4.js        |   2 +-
 tests/baselines/reference/generics4NoError.js |   2 +-
 .../genericsWithDuplicateTypeParameters1.js   |   2 +-
 .../genericsWithoutTypeParameters1.js         |   6 +-
 ...hImpliedReturnTypeAndFunctionClassMerge.js |   2 +-
 .../reference/getAndSetAsMemberNames.js       |  10 +-
 .../reference/getAndSetNotIdenticalType.js    |   2 +-
 .../reference/getAndSetNotIdenticalType2.js   |   4 +-
 .../reference/getAndSetNotIdenticalType3.js   |   4 +-
 .../reference/getEmitOutput-pp.baseline       |   4 +-
 .../reference/getEmitOutput.baseline          |   4 +-
 ...etEmitOutputDeclarationMultiFiles.baseline |   4 +-
 ...etEmitOutputDeclarationSingleFile.baseline |   4 +-
 .../getEmitOutputExternalModule.baseline      |   2 +-
 .../getEmitOutputExternalModule2.baseline     |   4 +-
 .../reference/getEmitOutputMapRoots.baseline  |   2 +-
 .../reference/getEmitOutputNoErrors.baseline  |   2 +-
 .../getEmitOutputOnlyOneFile.baseline         |   2 +-
 .../reference/getEmitOutputOutFile.baseline   |   4 +-
 .../getEmitOutputSingleFile.baseline          |   4 +-
 .../getEmitOutputSingleFile2.baseline         |   4 +-
 .../reference/getEmitOutputSourceMap.baseline |   2 +-
 .../getEmitOutputSourceMap2.baseline          |   2 +-
 .../getEmitOutputSourceRoot.baseline          |   2 +-
 ...getEmitOutputSourceRootMultiFiles.baseline |   4 +-
 .../getEmitOutputTsxFile_Preserve.baseline    |   2 +-
 .../getEmitOutputTsxFile_React.baseline       |   2 +-
 .../getEmitOutputWithDeclarationFile.baseline |   2 +-
 ...getEmitOutputWithDeclarationFile2.baseline |   2 +-
 .../getEmitOutputWithEmitterErrors.baseline   |   2 +-
 .../getEmitOutputWithEmitterErrors2.baseline  |   2 +-
 .../getSetAccessorContextualTyping.js         |   2 +-
 .../reference/getterMissingReturnError.js     |   2 +-
 .../getterThatThrowsShouldNotNeedReturn.js    |   2 +-
 .../baselines/reference/gettersAndSetters.js  |   2 +-
 .../gettersAndSettersAccessibility.js         |   2 +-
 .../reference/gettersAndSettersErrors.js      |   4 +-
 .../reference/gettersAndSettersTypesAgree.js  |   2 +-
 tests/baselines/reference/giant.js            |  28 +--
 .../reference/grammarAmbiguities1.js          |   4 +-
 .../heterogeneousArrayAndOverloads.js         |   2 +-
 .../reference/heterogeneousArrayLiterals.js   |   6 +-
 .../reference/ifDoWhileStatements.js          |  10 +-
 .../illegalModifiersOnClassElements.js        |   2 +-
 .../illegalSuperCallsInConstructor.js         |   4 +-
 .../implementClausePrecedingExtends.js        |   4 +-
 .../implementGenericWithMismatchedTypes.js    |   4 +-
 .../implementInterfaceAnyMemberWithVoid.js    |   2 +-
 .../implementPublicPropertyAsPrivate.js       |   2 +-
 ...ngAnInterfaceExtendingClassWithPrivates.js |  10 +-
 ...gAnInterfaceExtendingClassWithPrivates2.js |  28 +--
 ...AnInterfaceExtendingClassWithProtecteds.js |  18 +-
 .../reference/implementsClauseAlreadySeen.js  |   4 +-
 .../reference/implementsInClassExpression.js  |   2 +-
 .../implicitAnyAnyReturningFunction.js        |   2 +-
 .../reference/implicitAnyCastedValue.js       |   4 +-
 .../implicitAnyDeclareMemberWithoutType2.js   |   2 +-
 ...plicitAnyDeclareTypePropertyWithoutType.js |   2 +-
 .../implicitAnyFromCircularInference.js       |   4 +-
 ...tAnyFunctionInvocationWithAnyArguements.js |   2 +-
 ...mplicitAnyFunctionReturnNullOrUndefined.js |   2 +-
 .../reference/implicitAnyGenerics.js          |   4 +-
 ...itAnyGetAndSetAccessorWithAnyReturnType.js |   6 +-
 .../baselines/reference/implicitAnyInCatch.js |   2 +-
 .../reference/implicitAnyWidenToAny.js        |   2 +-
 .../reference/importAliasIdentifiers.js       |   4 +-
 .../importAndVariableDeclarationConflict2.js  |   2 +-
 .../baselines/reference/importAsBaseClass.js  |   4 +-
 tests/baselines/reference/importDecl.js       |   8 +-
 .../importDeclarationUsedAsTypeQuery.js       |   2 +-
 .../reference/importImportOnlyModule.js       |   2 +-
 .../reference/importInTypePosition.js         |   2 +-
 .../reference/importShadowsGlobalName.js      |   4 +-
 tests/baselines/reference/importStatements.js |   2 +-
 .../reference/importUsedInExtendsList1.js     |   4 +-
 .../import_reference-exported-alias.js        |   2 +-
 .../import_reference-to-type-alias.js         |   2 +-
 ...ar-referencing-an-imported-module-alias.js |   2 +-
 .../importedAliasesInTypePositions.js         |   4 +-
 .../reference/importedModuleAddToGlobal.js    |   2 +-
 .../reference/importedModuleClassNameClash.js |   2 +-
 .../reference/inOperatorWithGeneric.js        |   2 +-
 .../baselines/reference/incompatibleTypes.js  |   8 +-
 .../reference/incorrectClassOverloadChain.js  |   2 +-
 .../reference/incrementOnTypeParameter.js     |   2 +-
 .../incrementOperatorWithAnyOtherType.js      |   2 +-
 ...eratorWithAnyOtherTypeInvalidOperations.js |   2 +-
 .../incrementOperatorWithNumberType.js        |   2 +-
 ...OperatorWithNumberTypeInvalidOperations.js |   2 +-
 ...ementOperatorWithUnsupportedBooleanType.js |   2 +-
 ...rementOperatorWithUnsupportedStringType.js |   2 +-
 .../baselines/reference/indexClassByNumber.js |   2 +-
 .../indexSignatureMustHaveTypeAnnotation.js   |   4 +-
 .../reference/indexSignatureTypeCheck2.js     |   2 +-
 ...indexSignatureWithAccessibilityModifier.js |   2 +-
 .../indexSignatureWithInitializer.js          |   2 +-
 .../indexSignatureWithInitializer1.js         |   2 +-
 .../indexSignatureWithoutTypeAnnotation1.js   |   2 +-
 tests/baselines/reference/indexTypeCheck.js   |   2 +-
 .../reference/indexWithoutParamType2.js       |   2 +-
 tests/baselines/reference/indexer2A.js        |   4 +-
 tests/baselines/reference/indexerA.js         |   4 +-
 .../baselines/reference/indexerAsOptional.js  |   2 +-
 .../reference/indexerConstraints2.js          |  16 +-
 .../indexerReturningTypeParameter1.js         |   2 +-
 .../indexerSignatureWithRestParam.js          |   2 +-
 .../reference/indexersInClassType.js          |   2 +-
 .../reference/indirectSelfReference.js        |   4 +-
 .../reference/indirectSelfReferenceGeneric.js |   4 +-
 .../reference/inferSetterParamType.js         |   4 +-
 .../inferentialTypingUsingApparentType3.js    |   6 +-
 .../reference/infinitelyExpandingOverloads.js |   6 +-
 .../infinitelyExpandingTypesNonGenericBase.js |   6 +-
 .../inheritFromGenericTypeParameter.js        |   2 +-
 ...mePrivatePropertiesFromDifferentOrigins.js |   4 +-
 ...SameNamePrivatePropertiesFromSameOrigin.js |   6 +-
 ...meNamePropertiesWithDifferentVisibility.js |   4 +-
 tests/baselines/reference/inheritance.js      |  16 +-
 tests/baselines/reference/inheritance1.js     |  14 +-
 ...itanceGrandParentPrivateMemberCollision.js |   6 +-
 ...tPrivateMemberCollisionWithPublicMember.js |   6 +-
 ...tPublicMemberCollisionWithPrivateMember.js |   6 +-
 ...ritanceMemberAccessorOverridingAccessor.js |   4 +-
 ...heritanceMemberAccessorOverridingMethod.js |   4 +-
 ...ritanceMemberAccessorOverridingProperty.js |   4 +-
 ...inheritanceMemberFuncOverridingAccessor.js |   4 +-
 .../inheritanceMemberFuncOverridingMethod.js  |   4 +-
 ...inheritanceMemberFuncOverridingProperty.js |   4 +-
 ...ritanceMemberPropertyOverridingAccessor.js |   4 +-
 ...heritanceMemberPropertyOverridingMethod.js |   4 +-
 ...ritanceMemberPropertyOverridingProperty.js |   4 +-
 .../inheritanceOfGenericConstructorMethod1.js |   4 +-
 .../inheritanceOfGenericConstructorMethod2.js |   8 +-
 ...ritanceStaticAccessorOverridingAccessor.js |   4 +-
 ...heritanceStaticAccessorOverridingMethod.js |   4 +-
 ...ritanceStaticAccessorOverridingProperty.js |   4 +-
 ...inheritanceStaticFuncOverridingAccessor.js |   4 +-
 ...eStaticFuncOverridingAccessorOfFuncType.js |   4 +-
 .../inheritanceStaticFuncOverridingMethod.js  |   4 +-
 ...inheritanceStaticFuncOverridingProperty.js |   4 +-
 ...eStaticFuncOverridingPropertyOfFuncType.js |   4 +-
 ...taticFunctionOverridingInstanceProperty.js |   4 +-
 .../inheritanceStaticMembersCompatible.js     |   4 +-
 .../inheritanceStaticMembersIncompatible.js   |   4 +-
 ...ritanceStaticPropertyOverridingAccessor.js |   4 +-
 ...heritanceStaticPropertyOverridingMethod.js |   4 +-
 ...ritanceStaticPropertyOverridingProperty.js |   4 +-
 .../inheritedConstructorWithRestParams.js     |   4 +-
 .../inheritedConstructorWithRestParams2.js    |   8 +-
 .../inheritedModuleMembersForClodule.js       |   6 +-
 ...initializerReferencingConstructorLocals.js |   4 +-
 ...ializerReferencingConstructorParameters.js |   8 +-
 tests/baselines/reference/innerAliases.js     |   4 +-
 tests/baselines/reference/innerAliases2.js    |   2 +-
 .../reference/innerBoundLambdaEmit.js         |   2 +-
 tests/baselines/reference/innerExtern.js      |   2 +-
 .../innerTypeParameterShadowingOuterOne2.js   |   4 +-
 .../instanceAndStaticDeclarations1.js         |   2 +-
 .../instanceMemberAssignsToClassPrototype.js  |   2 +-
 .../reference/instanceMemberInitialization.js |   2 +-
 .../reference/instanceOfAssignability.js      |  12 +-
 .../reference/instanceOfInExternalModules.js  |   2 +-
 ...nstancePropertiesInheritedIntoClassType.js |   8 +-
 .../reference/instancePropertyInClassType.js  |   4 +-
 .../reference/instanceSubtypeCheck2.js        |   4 +-
 .../baselines/reference/instanceofOperator.js |   2 +-
 .../instanceofOperatorWithInvalidOperands.js  |   2 +-
 .../instanceofOperatorWithLHSIsObject.js      |   2 +-
 ...ericClassWithWrongNumberOfTypeArguments.js |   4 +-
 ...ntiateGenericClassWithZeroTypeArguments.js |   4 +-
 ...tantiateNonGenericTypeWithTypeArguments.js |   2 +-
 .../instantiatedBaseTypeConstraints.js        |   2 +-
 .../baselines/reference/instantiatedModule.js |   2 +-
 .../instantiatedReturnTypeContravariance.js   |   4 +-
 tests/baselines/reference/intTypeCheck.js     |   2 +-
 .../reference/interfaceClassMerging.js        |   4 +-
 .../reference/interfaceClassMerging2.js       |   4 +-
 .../reference/interfaceContextualType.js      |   2 +-
 .../reference/interfaceDeclaration1.js        |   2 +-
 .../reference/interfaceDeclaration2.js        |   2 +-
 .../reference/interfaceDeclaration3.js        |  22 +-
 .../reference/interfaceDeclaration4.js        |   8 +-
 .../reference/interfaceDeclaration5.js        |   2 +-
 .../reference/interfaceExtendingClass.js      |   2 +-
 .../reference/interfaceExtendingClass2.js     |   2 +-
 .../interfaceExtendingClassWithPrivates.js    |   2 +-
 .../interfaceExtendingClassWithPrivates2.js   |   6 +-
 .../interfaceExtendingClassWithProtecteds.js  |   2 +-
 .../interfaceExtendingClassWithProtecteds2.js |   6 +-
 .../reference/interfaceExtendsClass1.js       |  10 +-
 .../interfaceExtendsClassWithPrivate1.js      |   4 +-
 .../interfaceExtendsClassWithPrivate2.js      |   6 +-
 .../reference/interfaceImplementation1.js     |   4 +-
 .../reference/interfaceImplementation2.js     |   2 +-
 .../reference/interfaceImplementation3.js     |   2 +-
 .../reference/interfaceImplementation4.js     |   2 +-
 .../reference/interfaceImplementation5.js     |  12 +-
 .../reference/interfaceImplementation6.js     |   8 +-
 .../reference/interfaceImplementation7.js     |   2 +-
 .../reference/interfaceImplementation8.js     |  16 +-
 .../reference/interfaceInReopenedModule.js    |   2 +-
 .../reference/interfaceInheritance.js         |   2 +-
 .../interfacePropertiesWithSameName3.js       |   4 +-
 .../baselines/reference/interfaceSubtyping.js |   2 +-
 .../interfaceWithMultipleDeclarations.js      |   2 +-
 .../interfaceWithPropertyOfEveryType.js       |   2 +-
 ...faceWithPropertyThatIsPrivateInBaseType.js |   4 +-
 ...aceWithPropertyThatIsPrivateInBaseType2.js |   4 +-
 tests/baselines/reference/interfacedecl.js    |   2 +-
 .../interfacedeclWithIndexerErrors.js         |   2 +-
 .../baselines/reference/internalAliasClass.js |   2 +-
 ...alAliasClassInsideLocalModuleWithExport.js |   2 +-
 ...liasClassInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...liasClassInsideTopLevelModuleWithExport.js |   2 +-
 ...sClassInsideTopLevelModuleWithoutExport.js |   2 +-
 .../internalAliasInitializedModule.js         |   2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |   2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |   2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |   2 +-
 ...leMergedWithClassNotReferencingInstance.js |   2 +-
 ...thClassNotReferencingInstanceNoConflict.js |   2 +-
 ...leMergedWithClassNotReferencingInstance.js |   2 +-
 ...thClassNotReferencingInstanceNoConflict.js |   2 +-
 tests/baselines/reference/intrinsics.js       |   4 +-
 .../reference/invalidAssignmentsToVoid.js     |   2 +-
 .../reference/invalidBooleanAssignments.js    |   2 +-
 .../invalidImportAliasIdentifiers.js          |   2 +-
 .../reference/invalidInstantiatedModule.js    |   2 +-
 .../invalidModuleWithStatementsOfEveryKind.js |  30 +--
 .../invalidMultipleVariableDeclarations.js    |   8 +-
 .../reference/invalidNestedModules.js         |   6 +-
 .../reference/invalidNumberAssignments.js     |   2 +-
 .../reference/invalidReferenceSyntax1.js      |   2 +-
 .../reference/invalidReturnStatements.js      |   4 +-
 .../baselines/reference/invalidStaticField.js |   4 +-
 .../reference/invalidStringAssignments.js     |   2 +-
 tests/baselines/reference/invalidTypeNames.js |   2 +-
 .../reference/invalidUndefinedAssignments.js  |   2 +-
 .../reference/invalidUndefinedValues.js       |   2 +-
 .../reference/invalidVoidAssignments.js       |   2 +-
 .../baselines/reference/invalidVoidValues.js  |   2 +-
 ...okingNonGenericMethodWithTypeArguments1.js |   2 +-
 ...okingNonGenericMethodWithTypeArguments2.js |   2 +-
 .../isDeclarationVisibleNodeKinds.js          |   2 +-
 .../isolatedModulesImportExportElision.js     |   2 +-
 ...ationClassMethodContainingArrowFunction.js |   2 +-
 .../jsFileCompilationEmitBlockedCorrectly.js  |   2 +-
 .../jsFileCompilationEmitDeclarations.js      |   2 +-
 ...ileCompilationEmitTrippleSlashReference.js |   2 +-
 ...eclarationsWithJsFileReferenceWithNoOut.js |   2 +-
 ...nDeclarationsWithJsFileReferenceWithOut.js |   2 +-
 ...clarationsWithJsFileReferenceWithOutDir.js |   2 +-
 ...eclarationsWithJsFileReferenceWithNoOut.js |   2 +-
 ...tDeclarationsWithJsFileReferenceWithOut.js |   2 +-
 ...ationWithDeclarationEmitPathSameAsInput.js |   2 +-
 .../jsFileCompilationWithMapFileAsJs.js       |   2 +-
 ...leCompilationWithMapFileAsJs.sourcemap.txt |   2 +-
 ...ationWithMapFileAsJsWithInlineSourceMap.js |   2 +-
 ...pFileAsJsWithInlineSourceMap.sourcemap.txt |   2 +-
 ...ileCompilationWithMapFileAsJsWithOutDir.js |   2 +-
 ...ionWithMapFileAsJsWithOutDir.sourcemap.txt |   2 +-
 .../reference/jsFileCompilationWithOut.js     |   2 +-
 ...OutDeclarationFileNameSameAsInputJsFile.js |   2 +-
 .../reference/jsFileCompilationWithoutOut.js  |   2 +-
 .../reference/jsxAndTypeAssertion.js          |   2 +-
 tests/baselines/reference/jsxViaImport.js     |   2 +-
 tests/baselines/reference/lambdaArgCrash.js   |   4 +-
 tests/baselines/reference/lambdaPropSelf.js   |   4 +-
 tests/baselines/reference/libMembers.js       |   2 +-
 tests/baselines/reference/lift.js             |   4 +-
 tests/baselines/reference/listFailure.js      |   6 +-
 .../literalsInComputedProperties1.js          |   2 +-
 .../baselines/reference/localClassesInLoop.js |   2 +-
 tests/baselines/reference/localTypes1.js      |  26 +-
 tests/baselines/reference/localTypes2.js      |   6 +-
 tests/baselines/reference/localTypes3.js      |   6 +-
 tests/baselines/reference/localTypes5.js      |   4 +-
 .../logicalNotOperatorWithAnyOtherType.js     |   2 +-
 .../logicalNotOperatorWithBooleanType.js      |   2 +-
 .../logicalNotOperatorWithNumberType.js       |   2 +-
 .../logicalNotOperatorWithStringType.js       |   2 +-
 tests/baselines/reference/m7Bugs.js           |   4 +-
 .../reference/matchReturnTypeInAllBranches.js |   2 +-
 .../memberAccessMustUseModuleInstances.js     |   2 +-
 ...FunctionOverloadMixingStaticAndInstance.js |   8 +-
 .../memberFunctionsWithPrivateOverloads.js    |   4 +-
 .../memberFunctionsWithPublicOverloads.js     |   4 +-
 ...mberFunctionsWithPublicPrivateOverloads.js |   4 +-
 tests/baselines/reference/memberScope.js      |   2 +-
 .../reference/memberVariableDeclarations1.js  |   4 +-
 .../reference/mergedClassInterface.js         |   4 +-
 .../mergedInheritedClassInterface.js          |   8 +-
 .../mergedInterfacesWithInheritedPrivates.js  |   6 +-
 .../mergedInterfacesWithInheritedPrivates2.js |   8 +-
 .../mergedInterfacesWithInheritedPrivates3.js |  10 +-
 .../mergedInterfacesWithMultipleBases.js      |  12 +-
 .../mergedInterfacesWithMultipleBases2.js     |  20 +-
 .../mergedInterfacesWithMultipleBases3.js     |  10 +-
 .../mergedInterfacesWithMultipleBases4.js     |  10 +-
 .../mergedModuleDeclarationCodeGen.js         |   4 +-
 .../mergedModuleDeclarationCodeGen5.js        |   2 +-
 .../methodContainingLocalFunction.js          |   8 +-
 .../methodSignatureDeclarationEmit1.js        |   2 +-
 .../mismatchedClassConstructorVariable.js     |   4 +-
 .../reference/mismatchedGenericArguments1.js  |   4 +-
 .../reference/missingDecoratorType.js         |   2 +-
 .../missingImportAfterModuleImport.js         |   2 +-
 .../missingPropertiesOfClassExpression.js     |   4 +-
 .../reference/missingReturnStatement.js       |   2 +-
 .../reference/missingReturnStatement1.js      |   2 +-
 tests/baselines/reference/missingSelf.js      |   4 +-
 .../reference/missingTypeArguments1.js        |  22 +-
 .../reference/missingTypeArguments2.js        |   2 +-
 .../mixedStaticAndInstanceClassMembers.js     |   4 +-
 .../mixingStaticAndInstanceOverloads.js       |  10 +-
 ...ifierOnClassDeclarationMemberInFunction.js |   2 +-
 ...difierOnClassExpressionMemberInFunction.js |   2 +-
 .../reference/modifierOnParameter1.js         |   2 +-
 .../reference/moduleAliasInterface.js         |  12 +-
 tests/baselines/reference/moduleAsBaseType.js |   4 +-
 .../reference/moduleAssignmentCompat1.js      |   6 +-
 .../reference/moduleAssignmentCompat2.js      |   6 +-
 .../reference/moduleAssignmentCompat4.js      |   4 +-
 .../reference/moduleClassArrayCodeGenTest.js  |   4 +-
 .../baselines/reference/moduleCodeGenTest5.js |   4 +-
 tests/baselines/reference/moduleCrashBug1.js  |   2 +-
 .../reference/moduleDuplicateIdentifiers.js   |   4 +-
 .../reference/moduleElementsInWrongContext.js |   2 +-
 .../moduleElementsInWrongContext2.js          |   2 +-
 .../moduleElementsInWrongContext3.js          |   2 +-
 tests/baselines/reference/moduleExports1.js   |   2 +-
 .../moduleImportedForTypeArgumentPosition.js  |   4 +-
 .../reference/moduleInTypePosition1.js        |   2 +-
 .../moduleMemberWithoutTypeAnnotation1.js     |  10 +-
 tests/baselines/reference/moduleMerge.js      |   4 +-
 .../reference/moduleMergeConstructor.js       |   2 +-
 .../baselines/reference/moduleNewExportBug.js |   2 +-
 .../baselines/reference/modulePrologueAMD.js  |   2 +-
 .../reference/modulePrologueCommonjs.js       |   2 +-
 .../reference/modulePrologueSystem.js         |   2 +-
 .../baselines/reference/modulePrologueUmd.js  |   2 +-
 .../reference/moduleRedifinitionErrors.js     |   2 +-
 .../reference/moduleReopenedTypeOtherBlock.js |   4 +-
 .../reference/moduleReopenedTypeSameBlock.js  |   4 +-
 tests/baselines/reference/moduleScopingBug.js |   2 +-
 .../reference/moduleVisibilityTest1.js        |   4 +-
 .../reference/moduleVisibilityTest2.js        |   4 +-
 .../reference/moduleVisibilityTest3.js        |   4 +-
 .../moduleWithStatementsOfEveryKind.js        |  20 +-
 tests/baselines/reference/moduledecl.js       |  10 +-
 .../baselines/reference/multiImportExport.js  |   2 +-
 .../reference/multiModuleClodule1.js          |   2 +-
 .../multipleClassPropertyModifiers.js         |   2 +-
 .../multipleClassPropertyModifiersErrors.js   |   2 +-
 .../reference/multipleDefaultExports01.js     |   2 +-
 .../reference/multipleDefaultExports03.js     |   4 +-
 .../reference/multipleInheritance.js          |  20 +-
 .../reference/multipleNumericIndexers.js      |   4 +-
 .../reference/multipleStringIndexers.js       |   4 +-
 tests/baselines/reference/multivar.js         |   4 +-
 .../mutuallyRecursiveGenericBaseTypes2.js     |   4 +-
 tests/baselines/reference/nameCollision.js    |   2 +-
 tests/baselines/reference/nameCollisions.js   |  12 +-
 ...nctionExpressionAssignedToClassProperty.js |   2 +-
 tests/baselines/reference/namespaces2.js      |   2 +-
 .../reference/narrowTypeByInstanceof.js       |   4 +-
 .../negateOperatorWithAnyOtherType.js         |   2 +-
 .../negateOperatorWithBooleanType.js          |   2 +-
 .../reference/negateOperatorWithNumberType.js |   2 +-
 .../reference/negateOperatorWithStringType.js |   2 +-
 .../reference/nestedClassDeclaration.js       |   6 +-
 tests/baselines/reference/nestedSelf.js       |   2 +-
 tests/baselines/reference/newArrays.js        |   4 +-
 .../reference/newOnInstanceSymbol.js          |   2 +-
 tests/baselines/reference/newOperator.js      |   4 +-
 .../reference/newOperatorConformance.js       |   6 +-
 .../reference/newOperatorErrorCases.js        |   6 +-
 tests/baselines/reference/newWithSpread.js    |   2 +-
 tests/baselines/reference/newWithSpreadES5.js |   2 +-
 ...CollisionThisExpressionAndClassInGlobal.js |   2 +-
 ...ionThisExpressionAndLocalVarInAccessors.js |   4 +-
 ...nThisExpressionAndLocalVarInConstructor.js |   4 +-
 ...lisionThisExpressionAndLocalVarInMethod.js |   2 +-
 ...sionThisExpressionAndLocalVarInProperty.js |   4 +-
 .../reference/noConstraintInReturnType1.js    |   2 +-
 tests/baselines/reference/noEmitHelpers.js    |   4 +-
 tests/baselines/reference/noEmitHelpers2.js   |   2 +-
 .../baselines/reference/noErrorsInCallback.js |   2 +-
 .../noImplicitAnyForMethodParameters.js       |   4 +-
 .../noImplicitAnyParametersInClass.js         |   2 +-
 .../reference/noTypeArgumentOnReturnType1.js  |   2 +-
 ...enericClassExtendingGenericClassWithAny.js |   4 +-
 ...onGenericTypeReferenceWithTypeArguments.js |   4 +-
 .../reference/nonInstantiatedModule.js        |   2 +-
 .../nonMergedDeclarationsAndOverloads.js      |   2 +-
 tests/baselines/reference/null.js             |   2 +-
 .../reference/nullAssignableToEveryType.js    |   2 +-
 .../nullIsSubtypeOfEverythingButUndefined.js  |   6 +-
 .../reference/numericClassMembers1.js         |   6 +-
 ...icIndexerConstrainsPropertyDeclarations.js |   2 +-
 ...cIndexerConstrainsPropertyDeclarations2.js |   6 +-
 .../reference/numericIndexerConstraint.js     |   2 +-
 .../reference/numericIndexerConstraint1.js    |   2 +-
 .../reference/numericIndexerConstraint2.js    |   2 +-
 .../reference/numericIndexerConstraint3.js    |   6 +-
 .../reference/numericIndexerConstraint4.js    |   4 +-
 .../reference/numericIndexerTyping2.js        |   4 +-
 .../reference/numericIndexingResults.js       |   2 +-
 .../baselines/reference/numericMethodName1.js |   2 +-
 .../numericNamedPropertyDuplicates.js         |   2 +-
 .../numericStringNamedPropertyEquivalence.js  |   2 +-
 ...ctCreationExpressionInFunctionParameter.js |   2 +-
 ...objectCreationOfElementAccessExpression.js |  16 +-
 tests/baselines/reference/objectIndexer.js    |   2 +-
 .../reference/objectLitArrayDeclNoNew.js      |   2 +-
 .../objectLiteralDeclarationGeneration1.js    |   2 +-
 .../reference/objectMembersOnTypes.js         |   2 +-
 ...objectTypeHidingMembersOfExtendedObject.js |   6 +-
 .../objectTypeHidingMembersOfObject.js        |   2 +-
 ...peHidingMembersOfObjectAssignmentCompat.js |   2 +-
 ...eHidingMembersOfObjectAssignmentCompat2.js |   2 +-
 .../reference/objectTypePropertyAccess.js     |   2 +-
 .../objectTypeWithDuplicateNumericProperty.js |   2 +-
 .../objectTypeWithNumericProperty.js          |   2 +-
 .../objectTypeWithRecursiveWrappedProperty.js |   2 +-
 ...objectTypeWithRecursiveWrappedProperty2.js |   2 +-
 ...ecursiveWrappedPropertyCheckedNominally.js |   4 +-
 ...ypeWithStringIndexerHidingObjectIndexer.js |   2 +-
 ...bjectTypeWithStringNamedNumericProperty.js |   2 +-
 ...hStringNamedPropertyOfIllegalCharacters.js |   2 +-
 .../reference/objectTypesIdentity.js          |   6 +-
 .../reference/objectTypesIdentity2.js         |   6 +-
 .../objectTypesIdentityWithCallSignatures.js  |   6 +-
 .../objectTypesIdentityWithCallSignatures2.js |   6 +-
 ...yWithCallSignaturesDifferingParamCounts.js |   6 +-
 ...IdentityWithCallSignaturesWithOverloads.js |   6 +-
 ...ectTypesIdentityWithConstructSignatures.js |   6 +-
 ...ctTypesIdentityWithConstructSignatures2.js |   4 +-
 ...ConstructSignaturesDifferingParamCounts.js |   4 +-
 ...tTypesIdentityWithGenericCallSignatures.js |   6 +-
 ...TypesIdentityWithGenericCallSignatures2.js |   6 +-
 ...ricCallSignaturesDifferingByConstraints.js |   6 +-
 ...icCallSignaturesDifferingByConstraints2.js |   8 +-
 ...icCallSignaturesDifferingByConstraints3.js |  12 +-
 ...ericCallSignaturesDifferingByReturnType.js |   6 +-
 ...ricCallSignaturesDifferingByReturnType2.js |   6 +-
 ...lSignaturesDifferingTypeParameterCounts.js |   6 +-
 ...llSignaturesDifferingTypeParameterNames.js |   6 +-
 ...WithGenericCallSignaturesOptionalParams.js |   6 +-
 ...ithGenericCallSignaturesOptionalParams2.js |   6 +-
 ...ithGenericCallSignaturesOptionalParams3.js |   6 +-
 ...nstructSignaturesDifferingByConstraints.js |   4 +-
 ...structSignaturesDifferingByConstraints2.js |   6 +-
 ...structSignaturesDifferingByConstraints3.js |  10 +-
 ...onstructSignaturesDifferingByReturnType.js |   4 +-
 ...nstructSignaturesDifferingByReturnType2.js |   4 +-
 ...tSignaturesDifferingTypeParameterCounts.js |   4 +-
 ...ctSignaturesDifferingTypeParameterNames.js |   4 +-
 ...enericConstructSignaturesOptionalParams.js |   4 +-
 ...nericConstructSignaturesOptionalParams2.js |   4 +-
 ...nericConstructSignaturesOptionalParams3.js |   4 +-
 ...objectTypesIdentityWithNumericIndexers1.js |  10 +-
 ...objectTypesIdentityWithNumericIndexers2.js |  14 +-
 ...objectTypesIdentityWithNumericIndexers3.js |  10 +-
 .../objectTypesIdentityWithOptionality.js     |   6 +-
 .../objectTypesIdentityWithPrivates.js        |  10 +-
 .../objectTypesIdentityWithPrivates2.js       |   4 +-
 .../objectTypesIdentityWithPrivates3.js       |   8 +-
 .../objectTypesIdentityWithPublics.js         |   6 +-
 .../objectTypesIdentityWithStringIndexers.js  |  10 +-
 .../objectTypesIdentityWithStringIndexers2.js |  14 +-
 .../objectTypesWithOptionalProperties.js      |   4 +-
 .../objectTypesWithOptionalProperties2.js     |   4 +-
 .../objectTypesWithPredefinedTypesAsName.js   |  10 +-
 .../objectTypesWithPredefinedTypesAsName2.js  |   2 +-
 .../optionalArgsWithDefaultValues.js          |   2 +-
 .../optionalConstructorArgInSuper.js          |   4 +-
 .../reference/optionalParamArgsTest.js        |   4 +-
 .../reference/optionalParamInOverride.js      |   4 +-
 .../reference/optionalPropertiesInClasses.js  |   6 +-
 .../reference/optionalSetterParam.js          |   2 +-
 tests/baselines/reference/out-flag.js         |   2 +-
 .../reference/out-flag.sourcemap.txt          |   2 +-
 tests/baselines/reference/out-flag2.js        |   4 +-
 .../reference/out-flag2.sourcemap.txt         |   4 +-
 tests/baselines/reference/out-flag3.js        |   4 +-
 .../reference/out-flag3.sourcemap.txt         |   4 +-
 .../baselines/reference/outModuleConcatAmd.js |   4 +-
 .../reference/outModuleConcatAmd.js.map       |   2 +-
 .../outModuleConcatAmd.sourcemap.txt          |  18 +-
 .../reference/outModuleConcatSystem.js        |   4 +-
 .../reference/outModuleConcatSystem.js.map    |   2 +-
 .../outModuleConcatSystem.sourcemap.txt       |  18 +-
 .../reference/outModuleTripleSlashRefs.js     |   6 +-
 .../reference/outModuleTripleSlashRefs.js.map |   2 +-
 .../outModuleTripleSlashRefs.sourcemap.txt    |  20 +-
 tests/baselines/reference/overload1.js        |   6 +-
 tests/baselines/reference/overload2.js        |   2 +-
 .../reference/overloadAssignmentCompat.js     |   2 +-
 tests/baselines/reference/overloadCallTest.js |   2 +-
 .../reference/overloadConsecutiveness.js      |   2 +-
 .../overloadEquivalenceWithStatics.js         |   2 +-
 .../overloadGenericFunctionWithRestArgs.js    |   4 +-
 .../reference/overloadModifiersMustAgree.js   |   2 +-
 .../overloadOnConstConstraintChecks1.js       |  10 +-
 .../overloadOnConstConstraintChecks2.js       |   6 +-
 .../overloadOnConstConstraintChecks3.js       |   6 +-
 .../overloadOnConstConstraintChecks4.js       |   8 +-
 ...nstInBaseWithBadImplementationInDerived.js |   2 +-
 .../reference/overloadOnConstInCallback1.js   |   2 +-
 .../reference/overloadOnConstInheritance4.js  |   2 +-
 .../overloadOnConstNoAnyImplementation2.js    |   2 +-
 ...verloadOnConstNoNonSpecializedSignature.js |   2 +-
 .../overloadOnConstNoStringImplementation2.js |   2 +-
 .../overloadOnConstantsInvalidOverload1.js    |   8 +-
 ...verloadOnGenericClassAndNonGenericClass.js |  12 +-
 .../baselines/reference/overloadResolution.js |   8 +-
 .../overloadResolutionClassConstructors.js    |  18 +-
 .../overloadResolutionConstructors.js         |   8 +-
 ...overloadResolutionOnDefaultConstructor1.js |   2 +-
 .../overloadResolutionOverNonCTLambdas.js     |   2 +-
 .../reference/overloadReturnTypes.js          |   2 +-
 .../overloadedStaticMethodSpecialization.js   |   2 +-
 .../reference/overloadingOnConstants1.js      |   8 +-
 .../reference/overloadingOnConstants2.js      |   6 +-
 ...esolutionWithConstraintCheckingDeferred.js |   2 +-
 .../reference/overloadsWithinClasses.js       |   6 +-
 .../overridingPrivateStaticMembers.js         |   4 +-
 .../reference/paramPropertiesInSignatures.js  |   2 +-
 ...parameterInitializersForwardReferencing.js |   2 +-
 .../parameterNamesInTypeParameterList.js      |   2 +-
 .../parameterPropertyInConstructor2.js        |   2 +-
 ...ameterPropertyInitializerInInitializers.js |   2 +-
 .../parameterPropertyOutsideConstructor.js    |   2 +-
 ...ameterPropertyReferencingOtherParameter.js |   2 +-
 .../parameterReferencesOtherParameter1.js     |   4 +-
 .../parameterReferencesOtherParameter2.js     |   4 +-
 .../parametersWithNoAnnotationAreAny.js       |   2 +-
 .../reference/parseErrorInHeritageClause1.js  |   2 +-
 tests/baselines/reference/parser0_004152.js   |   2 +-
 tests/baselines/reference/parser509546.js     |   2 +-
 tests/baselines/reference/parser509546_1.js   |   2 +-
 tests/baselines/reference/parser509546_2.js   |   2 +-
 tests/baselines/reference/parser509630.js     |   4 +-
 tests/baselines/reference/parser509667.js     |   2 +-
 tests/baselines/reference/parser509668.js     |   2 +-
 tests/baselines/reference/parser512084.js     |   2 +-
 tests/baselines/reference/parser553699.js     |   4 +-
 tests/baselines/reference/parser585151.js     |   2 +-
 tests/baselines/reference/parser618973.js     |   2 +-
 tests/baselines/reference/parser642331.js     |   2 +-
 tests/baselines/reference/parser642331_1.js   |   2 +-
 .../parserAccessibilityAfterStatic1.js        |   2 +-
 .../parserAccessibilityAfterStatic10.js       |   2 +-
 .../parserAccessibilityAfterStatic11.js       |   2 +-
 .../parserAccessibilityAfterStatic14.js       |   2 +-
 .../parserAccessibilityAfterStatic2.js        |   2 +-
 .../parserAccessibilityAfterStatic3.js        |   2 +-
 .../parserAccessibilityAfterStatic4.js        |   2 +-
 .../parserAccessibilityAfterStatic5.js        |   2 +-
 .../parserAccessibilityAfterStatic6.js        |   2 +-
 .../parserAccessibilityAfterStatic7.js        |   2 +-
 tests/baselines/reference/parserAccessors1.js |   2 +-
 tests/baselines/reference/parserAccessors2.js |   2 +-
 tests/baselines/reference/parserAstSpans1.js  |  12 +-
 tests/baselines/reference/parserClass1.js     |   2 +-
 tests/baselines/reference/parserClass2.js     |   2 +-
 .../reference/parserClassDeclaration1.js      |   2 +-
 .../reference/parserClassDeclaration10.js     |   2 +-
 .../reference/parserClassDeclaration11.js     |   2 +-
 .../reference/parserClassDeclaration12.js     |   2 +-
 .../reference/parserClassDeclaration13.js     |   2 +-
 .../reference/parserClassDeclaration14.js     |   2 +-
 .../reference/parserClassDeclaration15.js     |   2 +-
 .../reference/parserClassDeclaration16.js     |   2 +-
 .../reference/parserClassDeclaration19.js     |   2 +-
 .../reference/parserClassDeclaration2.js      |   2 +-
 .../reference/parserClassDeclaration20.js     |   2 +-
 .../reference/parserClassDeclaration21.js     |   2 +-
 .../reference/parserClassDeclaration22.js     |   2 +-
 .../reference/parserClassDeclaration23.js     |   2 +-
 .../reference/parserClassDeclaration24.js     |   2 +-
 .../reference/parserClassDeclaration25.js     |   2 +-
 .../reference/parserClassDeclaration26.js     |   2 +-
 .../reference/parserClassDeclaration3.js      |   2 +-
 .../reference/parserClassDeclaration4.js      |   2 +-
 .../reference/parserClassDeclaration5.js      |   2 +-
 .../reference/parserClassDeclaration6.js      |   2 +-
 .../reference/parserClassDeclaration8.js      |   2 +-
 .../reference/parserClassDeclaration9.js      |   2 +-
 .../parserClassDeclarationIndexSignature1.js  |   2 +-
 .../parserConstructorDeclaration1.js          |   2 +-
 .../parserConstructorDeclaration10.js         |   2 +-
 .../parserConstructorDeclaration11.js         |   2 +-
 .../parserConstructorDeclaration12.js         |   2 +-
 .../parserConstructorDeclaration2.js          |   2 +-
 .../parserConstructorDeclaration3.js          |   2 +-
 .../parserConstructorDeclaration4.js          |   2 +-
 .../parserConstructorDeclaration5.js          |   2 +-
 .../parserConstructorDeclaration6.js          |   2 +-
 .../parserConstructorDeclaration7.js          |   2 +-
 .../parserConstructorDeclaration8.js          |   2 +-
 .../parserConstructorDeclaration9.js          |   2 +-
 .../reference/parserES3Accessors1.js          |   2 +-
 .../reference/parserES3Accessors2.js          |   2 +-
 .../parserES5ComputedPropertyName10.js        |   2 +-
 .../parserES5ComputedPropertyName11.js        |   2 +-
 .../parserES5ComputedPropertyName7.js         |   2 +-
 .../parserES5ComputedPropertyName9.js         |   2 +-
 .../reference/parserES5SymbolIndexer2.js      |   2 +-
 .../reference/parserES5SymbolProperty5.js     |   2 +-
 .../reference/parserES5SymbolProperty6.js     |   2 +-
 .../reference/parserES5SymbolProperty7.js     |   2 +-
 .../parserErrantSemicolonInClass1.js          |   2 +-
 .../parserErrorRecoveryIfStatement1.js        |   2 +-
 .../parserErrorRecoveryIfStatement2.js        |   2 +-
 .../parserErrorRecoveryIfStatement3.js        |   2 +-
 .../parserErrorRecoveryIfStatement4.js        |   2 +-
 .../parserErrorRecoveryIfStatement5.js        |   2 +-
 .../parserErrorRecoveryIfStatement6.js        |   2 +-
 .../reference/parserErrorRecovery_Block3.js   |   2 +-
 .../parserErrorRecovery_ClassElement1.js      |   4 +-
 .../parserErrorRecovery_ClassElement2.js      |   2 +-
 .../parserErrorRecovery_ClassElement3.js      |   2 +-
 ...rrorRecovery_ExtendsOrImplementsClause1.js |   2 +-
 ...rrorRecovery_ExtendsOrImplementsClause2.js |   2 +-
 ...rrorRecovery_ExtendsOrImplementsClause3.js |   2 +-
 ...rrorRecovery_ExtendsOrImplementsClause4.js |   2 +-
 ...rrorRecovery_ExtendsOrImplementsClause5.js |   2 +-
 ...ErrorRecovery_IncompleteMemberVariable1.js |   2 +-
 ...ErrorRecovery_IncompleteMemberVariable2.js |   2 +-
 .../parserErrorRecovery_ParameterList6.js     |   2 +-
 .../parserErrorRecovery_SourceUnit1.js        |   4 +-
 .../parserErrorRecovery_SwitchStatement2.js   |   4 +-
 .../reference/parserExportAssignment7.js      |   2 +-
 .../reference/parserExportAssignment8.js      |   2 +-
 .../reference/parserGenericClass1.js          |   2 +-
 .../reference/parserGenericClass2.js          |   2 +-
 .../reference/parserGenericConstraint1.js     |   2 +-
 .../reference/parserGenericConstraint2.js     |   2 +-
 .../reference/parserGenericConstraint3.js     |   2 +-
 .../reference/parserGenericConstraint4.js     |   2 +-
 .../reference/parserGenericConstraint5.js     |   2 +-
 .../reference/parserGenericConstraint6.js     |   2 +-
 .../reference/parserGenericConstraint7.js     |   2 +-
 .../parserGenericsInTypeContexts1.js          |   2 +-
 .../parserGenericsInTypeContexts2.js          |   2 +-
 .../parserGetAccessorWithTypeParameters1.js   |   2 +-
 .../parserIndexMemberDeclaration1.js          |   2 +-
 .../parserIndexMemberDeclaration10.js         |   2 +-
 .../parserIndexMemberDeclaration2.js          |   2 +-
 .../parserIndexMemberDeclaration3.js          |   2 +-
 .../parserIndexMemberDeclaration4.js          |   2 +-
 .../parserIndexMemberDeclaration5.js          |   2 +-
 .../parserIndexMemberDeclaration6.js          |   2 +-
 .../parserIndexMemberDeclaration7.js          |   2 +-
 .../parserIndexMemberDeclaration8.js          |   2 +-
 .../parserIndexMemberDeclaration9.js          |   2 +-
 ...InvalidIdentifiersInVariableStatements1.js |   2 +-
 .../reference/parserMemberAccessor1.js        |   2 +-
 .../parserMemberAccessorDeclaration1.js       |   2 +-
 .../parserMemberAccessorDeclaration10.js      |   2 +-
 .../parserMemberAccessorDeclaration11.js      |   2 +-
 .../parserMemberAccessorDeclaration12.js      |   2 +-
 .../parserMemberAccessorDeclaration13.js      |   2 +-
 .../parserMemberAccessorDeclaration14.js      |   2 +-
 .../parserMemberAccessorDeclaration15.js      |   2 +-
 .../parserMemberAccessorDeclaration16.js      |   2 +-
 .../parserMemberAccessorDeclaration17.js      |   2 +-
 .../parserMemberAccessorDeclaration18.js      |   2 +-
 .../parserMemberAccessorDeclaration2.js       |   2 +-
 .../parserMemberAccessorDeclaration3.js       |   2 +-
 .../parserMemberAccessorDeclaration4.js       |   2 +-
 .../parserMemberAccessorDeclaration5.js       |   2 +-
 .../parserMemberAccessorDeclaration6.js       |   2 +-
 .../parserMemberAccessorDeclaration7.js       |   2 +-
 .../parserMemberAccessorDeclaration8.js       |   2 +-
 .../parserMemberAccessorDeclaration9.js       |   2 +-
 .../parserMemberFunctionDeclaration1.js       |   2 +-
 .../parserMemberFunctionDeclaration2.js       |   2 +-
 .../parserMemberFunctionDeclaration3.js       |   2 +-
 .../parserMemberFunctionDeclaration4.js       |   2 +-
 .../parserMemberFunctionDeclaration5.js       |   2 +-
 ...erMemberFunctionDeclarationAmbiguities1.js |   2 +-
 .../parserMemberVariableDeclaration1.js       |   2 +-
 .../parserMemberVariableDeclaration2.js       |   2 +-
 .../parserMemberVariableDeclaration3.js       |   2 +-
 .../parserMemberVariableDeclaration4.js       |   2 +-
 .../parserMemberVariableDeclaration5.js       |   2 +-
 .../parserMissingLambdaOpenBrace1.js          |   2 +-
 .../reference/parserParameterList1.js         |   2 +-
 .../reference/parserParameterList10.js        |   2 +-
 .../reference/parserParameterList16.js        |   2 +-
 .../reference/parserParameterList17.js        |   2 +-
 .../reference/parserParameterList2.js         |   2 +-
 .../reference/parserParameterList3.js         |   2 +-
 .../reference/parserParameterList6.js         |   2 +-
 .../reference/parserParameterList7.js         |   2 +-
 .../reference/parserParameterList9.js         |   2 +-
 .../baselines/reference/parserRealSource1.js  |   6 +-
 .../baselines/reference/parserRealSource10.js |  18 +-
 .../baselines/reference/parserRealSource11.js | 100 ++++----
 .../baselines/reference/parserRealSource12.js |   6 +-
 .../baselines/reference/parserRealSource14.js |   4 +-
 .../baselines/reference/parserRealSource4.js  |  12 +-
 .../baselines/reference/parserRealSource5.js  |   2 +-
 .../baselines/reference/parserRealSource6.js  |   6 +-
 .../baselines/reference/parserRealSource7.js  |   2 +-
 .../baselines/reference/parserRealSource8.js  |   4 +-
 .../baselines/reference/parserRealSource9.js  |   2 +-
 .../parserSetAccessorWithTypeAnnotation1.js   |   2 +-
 .../parserSetAccessorWithTypeParameters1.js   |   2 +-
 .../reference/parserSuperExpression1.js       |   4 +-
 .../reference/parserSuperExpression2.js       |   2 +-
 .../reference/parserSuperExpression3.js       |   2 +-
 .../reference/parserSuperExpression4.js       |   4 +-
 tests/baselines/reference/parserUnicode3.js   |   2 +-
 tests/baselines/reference/parserharness.js    |  32 +--
 tests/baselines/reference/parserindenter.js   |   2 +-
 ...sRecoversWhenHittingUnexpectedSemicolon.js |   2 +-
 .../reference/partiallyAmbientClodule.js      |   2 +-
 tests/baselines/reference/pinnedComments1.js  |   2 +-
 .../reference/plusOperatorWithAnyOtherType.js |   2 +-
 .../reference/plusOperatorWithBooleanType.js  |   2 +-
 .../reference/plusOperatorWithNumberType.js   |   2 +-
 .../reference/plusOperatorWithStringType.js   |   2 +-
 .../prespecializedGenericMembers1.js          |   4 +-
 .../reference/primitiveConstraints2.js        |   2 +-
 tests/baselines/reference/primitiveMembers.js |   4 +-
 .../reference/primitiveTypeAsClassName.js     |   2 +-
 .../reference/privacyAccessorDeclFile.js      | 146 ++++++------
 .../privacyCannotNameAccessorDeclFile.js      |  12 +-
 .../privacyCannotNameVarTypeDeclFile.js       |  12 +-
 ...nalModuleExportAssignmentOfGenericClass.js |   2 +-
 ...arameterReferenceInConstructorParameter.js |   4 +-
 tests/baselines/reference/privacyClass.js     |  84 +++----
 .../privacyClassExtendsClauseDeclFile.js      |  64 ++---
 .../privacyClassImplementsClauseDeclFile.js   |  48 ++--
 tests/baselines/reference/privacyFunc.js      |  22 +-
 ...FunctionCannotNameParameterTypeDeclFile.js |  20 +-
 ...acyFunctionCannotNameReturnTypeDeclFile.js |  12 +-
 .../privacyFunctionParameterDeclFile.js       |  84 +++----
 .../privacyFunctionReturnTypeDeclFile.js      |  84 +++----
 tests/baselines/reference/privacyGetter.js    |  24 +-
 tests/baselines/reference/privacyGloClass.js  |  36 +--
 tests/baselines/reference/privacyGloFunc.js   |  48 ++--
 tests/baselines/reference/privacyGloGetter.js |  12 +-
 tests/baselines/reference/privacyGloImport.js |   6 +-
 .../reference/privacyGloImportParseErrors.js  |   6 +-
 .../reference/privacyGloInterface.js          |   6 +-
 tests/baselines/reference/privacyGloVar.js    |  12 +-
 tests/baselines/reference/privacyImport.js    |  12 +-
 .../reference/privacyImportParseErrors.js     |  12 +-
 tests/baselines/reference/privacyInterface.js |  12 +-
 ...yLocalInternalReferenceImportWithExport.js |   8 +-
 ...calInternalReferenceImportWithoutExport.js |   8 +-
 ...elAmbientExternalModuleImportWithExport.js |   4 +-
 ...mbientExternalModuleImportWithoutExport.js |   4 +-
 ...pLevelInternalReferenceImportWithExport.js |   8 +-
 ...velInternalReferenceImportWithoutExport.js |   8 +-
 .../privacyTypeParameterOfFunction.js         |  16 +-
 .../privacyTypeParameterOfFunctionDeclFile.js |  56 ++---
 .../reference/privacyTypeParametersOfClass.js |  16 +-
 .../privacyTypeParametersOfClassDeclFile.js   |  56 ++---
 .../privacyTypeParametersOfInterface.js       |   8 +-
 ...rivacyTypeParametersOfInterfaceDeclFile.js |  24 +-
 tests/baselines/reference/privacyVar.js       |  24 +-
 .../baselines/reference/privacyVarDeclFile.js |  84 +++----
 .../reference/privateAccessInSubclass1.js     |   4 +-
 ...ivateClassPropertyAccessibleWithinClass.js |   4 +-
 tests/baselines/reference/privateIndexer.js   |   6 +-
 .../privateInstanceMemberAccessibility.js     |   4 +-
 .../reference/privateInstanceVisibility.js    |   4 +-
 .../reference/privateInterfaceProperties.js   |   4 +-
 .../privatePropertyUsingObjectType.js         |   2 +-
 .../privateStaticMemberAccessibility.js       |   4 +-
 .../privateStaticNotAccessibleInClodule.js    |   2 +-
 .../privateStaticNotAccessibleInClodule2.js   |   4 +-
 .../baselines/reference/privateVisibility.js  |   4 +-
 tests/baselines/reference/privateVisibles.js  |   2 +-
 tests/baselines/reference/promiseChaining.js  |   2 +-
 tests/baselines/reference/promiseChaining1.js |   2 +-
 tests/baselines/reference/promiseChaining2.js |   2 +-
 tests/baselines/reference/properties.js       |   2 +-
 .../reference/properties.sourcemap.txt        |   2 +-
 .../reference/propertiesAndIndexers.js        |   4 +-
 .../propertiesAndIndexersForNumericNames.js   |   2 +-
 tests/baselines/reference/propertyAccess.js   |   4 +-
 ...rtyAccessOnTypeParameterWithConstraints.js |   2 +-
 ...tyAccessOnTypeParameterWithConstraints2.js |   6 +-
 ...tyAccessOnTypeParameterWithConstraints3.js |   6 +-
 ...tyAccessOnTypeParameterWithConstraints4.js |   2 +-
 ...tyAccessOnTypeParameterWithConstraints5.js |   6 +-
 ...AccessOnTypeParameterWithoutConstraints.js |   2 +-
 .../reference/propertyAccessibility1.js       |   2 +-
 .../reference/propertyAccessibility2.js       |   2 +-
 .../propertyAndAccessorWithSameName.js        |   6 +-
 .../propertyAndFunctionWithSameName.js        |   4 +-
 .../propertyIdentityWithPrivacyMismatch.js    |   4 +-
 .../propertyNameWithoutTypeAnnotation.js      |   2 +-
 .../reference/propertyNamedPrototype.js       |   2 +-
 .../reference/propertyNamesOfReservedWords.js |   2 +-
 .../propertyNamesWithStringLiteral.js         |   2 +-
 tests/baselines/reference/propertyOrdering.js |   4 +-
 .../baselines/reference/propertyOrdering2.js  |   2 +-
 .../propertyParameterWithQuestionMark.js      |   2 +-
 .../reference/propertyWrappedInTry.js         |   2 +-
 ...ectedClassPropertyAccessibleWithinClass.js |   4 +-
 ...edClassPropertyAccessibleWithinSubclass.js |   4 +-
 ...dClassPropertyAccessibleWithinSubclass2.js |  10 +-
 ...dClassPropertyAccessibleWithinSubclass3.js |   4 +-
 .../protectedInstanceMemberAccessibility.js   |   6 +-
 tests/baselines/reference/protectedMembers.js |  28 +--
 ...icClassPropertyAccessibleWithinSubclass.js |   8 +-
 ...cClassPropertyAccessibleWithinSubclass2.js |   6 +-
 .../protectedStaticNotAccessibleInClodule.js  |   2 +-
 .../protoAsIndexInIndexExpression.js          |   2 +-
 tests/baselines/reference/protoInIndexer.js   |   2 +-
 ...prototypeInstantiatedWithBaseConstraint.js |   2 +-
 tests/baselines/reference/publicIndexer.js    |   6 +-
 ...emberImplementedAsPrivateInDerivedClass.js |   2 +-
 ...solution-does-not-affect-class-heritage.js |   2 +-
 .../reference/quotedAccessorName1.js          |   2 +-
 .../reference/quotedAccessorName2.js          |   2 +-
 .../reference/quotedFunctionName1.js          |   2 +-
 .../reference/quotedFunctionName2.js          |   2 +-
 .../reference/quotedPropertyName1.js          |   2 +-
 .../reference/quotedPropertyName2.js          |   2 +-
 .../reference/quotedPropertyName3.js          |   2 +-
 .../raiseErrorOnParameterProperty.js          |   2 +-
 .../reference/reachabilityChecks1.js          |   2 +-
 .../baselines/reference/reassignStaticProp.js |   2 +-
 .../reference/recursiveBaseCheck3.js          |   4 +-
 .../reference/recursiveBaseCheck4.js          |   2 +-
 .../reference/recursiveBaseCheck5.js          |   2 +-
 .../reference/recursiveBaseCheck6.js          |   2 +-
 .../recursiveBaseConstructorCreation1.js      |   4 +-
 ...ssInstantiationsWithDefaultConstructors.js |   4 +-
 .../reference/recursiveClassReferenceTest.js  |  10 +-
 .../recursiveClassReferenceTest.js.map        |   2 +-
 .../recursiveClassReferenceTest.sourcemap.txt |  40 ++--
 .../reference/recursiveCloduleReference.js    |   2 +-
 .../reference/recursiveComplicatedClasses.js  |  10 +-
 ...siveExportAssignmentAndFindAliasedType1.js |   2 +-
 ...siveExportAssignmentAndFindAliasedType2.js |   2 +-
 ...siveExportAssignmentAndFindAliasedType3.js |   2 +-
 ...siveExportAssignmentAndFindAliasedType4.js |   2 +-
 ...siveExportAssignmentAndFindAliasedType5.js |   2 +-
 ...siveExportAssignmentAndFindAliasedType6.js |   2 +-
 ...siveExportAssignmentAndFindAliasedType7.js |   2 +-
 .../reference/recursiveFunctionTypes.js       |   2 +-
 .../reference/recursiveFunctionTypes1.js      |   2 +-
 .../reference/recursiveGetterAccess.js        |   2 +-
 .../reference/recursiveInheritance3.js        |   2 +-
 tests/baselines/reference/recursiveMods.js    |   2 +-
 .../reference/recursiveProperties.js          |   4 +-
 .../recursiveSpecializationOfSignatures.js    |   2 +-
 .../recursiveTypeInGenericConstraint.js       |   6 +-
 ...rameterConstraintReferenceLacksTypeArgs.js |   2 +-
 .../recursiveTypeParameterReferenceError1.js  |   4 +-
 .../recursiveTypesUsedAsFunctionParameters.js |   4 +-
 ...sivelySpecializedConstructorDeclaration.js |   4 +-
 .../reference/reexportClassDefinition.js      |   4 +-
 .../reference/requireEmitSemicolon.js         |   4 +-
 .../requiredInitializedParameter2.js          |   2 +-
 .../requiredInitializedParameter3.js          |   2 +-
 .../requiredInitializedParameter4.js          |   2 +-
 ...lveTypeAliasWithSameLetDeclarationName1.js |   2 +-
 ...lassDeclarationWhenInBaseTypeResolution.js | 200 ++++++++--------
 .../baselines/reference/restParamModifier.js  |   2 +-
 .../baselines/reference/restParamModifier2.js |   2 +-
 .../restParameterAssignmentCompatibility.js   |   6 +-
 ...estParameterWithoutAnnotationIsAnyArray.js |   2 +-
 .../restParametersOfNonArrayTypes.js          |   2 +-
 .../restParametersOfNonArrayTypes2.js         |   4 +-
 .../restParametersWithArrayTypeAnnotations.js |   4 +-
 .../reference/returnInConstructor1.js         |  18 +-
 tests/baselines/reference/returnStatements.js |   4 +-
 .../reference/returnTypeTypeArguments.js      |  14 +-
 .../reference/returnValueInSetter.js          |   2 +-
 tests/baselines/reference/scannerClass2.js    |   2 +-
 tests/baselines/reference/scannertest1.js     |   2 +-
 ...peCheckExtendedClassInsidePublicMethod2.js |   4 +-
 ...peCheckExtendedClassInsideStaticMethod1.js |   4 +-
 .../scopeCheckInsidePublicMethod1.js          |   2 +-
 .../scopeCheckInsideStaticMethod1.js          |   2 +-
 .../reference/scopeResolutionIdentifiers.js   |   2 +-
 tests/baselines/reference/scopeTests.js       |   4 +-
 tests/baselines/reference/selfInCallback.js   |   2 +-
 tests/baselines/reference/selfInLambdas.js    |   2 +-
 tests/baselines/reference/selfRef.js          |   2 +-
 .../selfReferencesInFunctionParameters.js     |   2 +-
 .../reference/selfReferencingFile.js          |   2 +-
 .../reference/selfReferencingFile2.js         |   2 +-
 .../reference/selfReferencingFile3.js         |   2 +-
 .../baselines/reference/setterBeforeGetter.js |   2 +-
 tests/baselines/reference/setterWithReturn.js |   2 +-
 .../reference/shadowPrivateMembers.js         |   4 +-
 .../reference/shadowedInternalModule.js       |   2 +-
 .../sigantureIsSubTypeIfTheyAreIdentical.js   |   2 +-
 .../baselines/reference/sourceMap-Comments.js |   2 +-
 .../sourceMap-Comments.sourcemap.txt          |   2 +-
 .../reference/sourceMap-FileWithComments.js   |   2 +-
 .../sourceMap-FileWithComments.sourcemap.txt  |   2 +-
 tests/baselines/reference/sourceMapSample.js  |   2 +-
 .../reference/sourceMapSample.sourcemap.txt   |   2 +-
 .../reference/sourceMapValidationClass.js     |   2 +-
 .../sourceMapValidationClass.sourcemap.txt    |   2 +-
 ...apValidationClassWithDefaultConstructor.js |   2 +-
 ...nClassWithDefaultConstructor.sourcemap.txt |   2 +-
 ...aultConstructorAndCapturedThisStatement.js |   2 +-
 ...ctorAndCapturedThisStatement.sourcemap.txt |   2 +-
 ...sWithDefaultConstructorAndExtendsClause.js |   4 +-
 ...hDefaultConstructorAndExtendsClause.js.map |   2 +-
 ...tConstructorAndExtendsClause.sourcemap.txt |  24 +-
 .../reference/sourceMapValidationClasses.js   |   2 +-
 .../sourceMapValidationClasses.sourcemap.txt  |   2 +-
 .../sourceMapValidationDecorators.js          |   2 +-
 ...ourceMapValidationDecorators.sourcemap.txt |   2 +-
 .../sourceMapValidationExportAssignment.js    |   2 +-
 ...apValidationExportAssignment.sourcemap.txt |   2 +-
 ...ceMapValidationExportAssignmentCommonjs.js |   2 +-
 ...tionExportAssignmentCommonjs.sourcemap.txt |   2 +-
 .../reference/sourceMapValidationImport.js    |   2 +-
 .../sourceMapValidationImport.sourcemap.txt   |   2 +-
 .../sourceMapValidationWithComments.js        |   2 +-
 ...rceMapValidationWithComments.sourcemap.txt |   2 +-
 .../sourceMapWithCaseSensitiveFileNames.js    |   4 +-
 ...apWithCaseSensitiveFileNames.sourcemap.txt |   4 +-
 ...eMapWithCaseSensitiveFileNamesAndOutDir.js |   4 +-
 ...eSensitiveFileNamesAndOutDir.sourcemap.txt |   4 +-
 ...ultipleFilesWithFileEndingWithInterface.js |   2 +-
 ...sWithFileEndingWithInterface.sourcemap.txt |   2 +-
 .../sourceMapWithNonCaseSensitiveFileNames.js |   4 +-
 ...ithNonCaseSensitiveFileNames.sourcemap.txt |   4 +-
 ...pWithNonCaseSensitiveFileNamesAndOutDir.js |   4 +-
 ...eSensitiveFileNamesAndOutDir.sourcemap.txt |   4 +-
 .../sourcemapValidationDuplicateNames.js      |   2 +-
 ...emapValidationDuplicateNames.sourcemap.txt |   2 +-
 .../specializationOfExportedClass.js          |   2 +-
 .../specializedInheritedConstructors1.js      |   6 +-
 .../specializedLambdaTypeArguments.js         |   2 +-
 .../specializedOverloadWithRestParameters.js  |   4 +-
 ...reIsNotSubtypeOfNonSpecializedSignature.js |   6 +-
 ...atureIsSubtypeOfNonSpecializedSignature.js |   6 +-
 .../reference/staticAndMemberFunctions.js     |   2 +-
 .../staticAndNonStaticPropertiesSameName.js   |   2 +-
 .../baselines/reference/staticAsIdentifier.js |   2 +-
 .../reference/staticClassMemberError.js       |   4 +-
 tests/baselines/reference/staticClassProps.js |   2 +-
 tests/baselines/reference/staticFactory1.js   |   4 +-
 tests/baselines/reference/staticGetter1.js    |   2 +-
 tests/baselines/reference/staticGetter2.js    |   2 +-
 .../reference/staticGetterAndSetter.js        |   2 +-
 tests/baselines/reference/staticIndexer.js    |   2 +-
 tests/baselines/reference/staticIndexers.js   |   6 +-
 .../baselines/reference/staticInheritance.js  |   4 +-
 .../reference/staticInstanceResolution.js     |   2 +-
 .../reference/staticInstanceResolution2.js    |   4 +-
 .../reference/staticInstanceResolution3.js    |   2 +-
 .../reference/staticInstanceResolution4.js    |   2 +-
 .../staticInterfaceAssignmentCompat.js        |   2 +-
 .../staticMemberAccessOffDerivedType1.js      |   4 +-
 ...mberAssignsToConstructorFunctionMembers.js |   2 +-
 .../reference/staticMemberExportAccess.js     |   2 +-
 .../reference/staticMemberInitialization.js   |   2 +-
 ...AndPublicMemberOfAnotherClassAssignment.js |   4 +-
 .../staticMemberWithStringAndNumberNames.js   |   2 +-
 .../staticMembersUsingClassTypeParameter.js   |   6 +-
 .../staticMethodReferencingTypeArgument1.js   |   2 +-
 ...dWithTypeParameterExtendsClauseDeclFile.js |   6 +-
 ...icMethodsReferencingClassTypeParameters.js |   2 +-
 .../reference/staticModifierAlreadySeen.js    |   2 +-
 .../reference/staticMustPrecedePublic.js      |   2 +-
 .../reference/staticOffOfInstance1.js         |   2 +-
 .../reference/staticOffOfInstance2.js         |   2 +-
 tests/baselines/reference/staticPropSuper.js  |  10 +-
 .../staticPropertyAndFunctionWithSameName.js  |   4 +-
 .../reference/staticPropertyNotInClassType.js |   4 +-
 .../reference/staticPrototypeProperty.js      |   4 +-
 .../staticPrototypePropertyOnClass.js         |   8 +-
 tests/baselines/reference/staticVisibility.js |   4 +-
 tests/baselines/reference/statics.js          |   2 +-
 .../reference/staticsInConstructorBodies.js   |   2 +-
 .../reference/staticsNotInScopeInClodule.js   |   2 +-
 .../reference/strictModeInConstructor.js      |  14 +-
 .../reference/strictModeReservedWord.js       |   2 +-
 ...trictModeReservedWordInClassDeclaration.js |  16 +-
 .../strictModeUseContextualKeyword.js         |   2 +-
 .../reference/stringIndexerAndConstructor.js  |   2 +-
 .../reference/stringIndexerAssignments2.js    |   6 +-
 ...ngIndexerConstrainsPropertyDeclarations.js |   2 +-
 ...gIndexerConstrainsPropertyDeclarations2.js |   6 +-
 .../reference/stringIndexingResults.js        |   2 +-
 .../stringLiteralTypeIsSubtypeOfString.js     |   2 +-
 ...gLiteralTypesInImplementationSignatures.js |   2 +-
 ...LiteralTypesInImplementationSignatures2.js |   2 +-
 .../reference/stringNamedPropertyAccess.js    |   2 +-
 .../stringNamedPropertyDuplicates.js          |   2 +-
 tests/baselines/reference/stripInternal1.js   |   2 +-
 tests/baselines/reference/subtypesOfAny.js    |   6 +-
 .../reference/subtypesOfTypeParameter.js      |  10 +-
 .../subtypesOfTypeParameterWithConstraints.js |  60 ++---
 ...subtypesOfTypeParameterWithConstraints2.js |   6 +-
 ...subtypesOfTypeParameterWithConstraints4.js |  22 +-
 ...OfTypeParameterWithRecursiveConstraints.js |  42 ++--
 tests/baselines/reference/subtypesOfUnion.js  |   6 +-
 .../reference/subtypingTransitivity.js        |   6 +-
 .../reference/subtypingWithCallSignatures2.js |   8 +-
 .../reference/subtypingWithCallSignatures3.js |   8 +-
 .../reference/subtypingWithCallSignatures4.js |   8 +-
 .../subtypingWithConstructSignatures2.js      |   8 +-
 .../subtypingWithConstructSignatures3.js      |   8 +-
 .../subtypingWithConstructSignatures4.js      |   8 +-
 .../subtypingWithConstructSignatures5.js      |   8 +-
 .../subtypingWithConstructSignatures6.js      |   8 +-
 .../reference/subtypingWithNumericIndexer.js  |  16 +-
 .../reference/subtypingWithNumericIndexer3.js |  18 +-
 .../reference/subtypingWithNumericIndexer4.js |  10 +-
 .../reference/subtypingWithNumericIndexer5.js |  14 +-
 .../reference/subtypingWithObjectMembers.js   |  30 +--
 .../reference/subtypingWithObjectMembers4.js  |  16 +-
 .../reference/subtypingWithObjectMembers5.js  |  12 +-
 ...subtypingWithObjectMembersAccessibility.js |  16 +-
 ...ubtypingWithObjectMembersAccessibility2.js |  28 +--
 .../reference/subtypingWithStringIndexer.js   |  16 +-
 .../reference/subtypingWithStringIndexer3.js  |  18 +-
 .../reference/subtypingWithStringIndexer4.js  |  10 +-
 tests/baselines/reference/super.js            |   8 +-
 tests/baselines/reference/super1.js           |  20 +-
 tests/baselines/reference/super2.js           |  12 +-
 tests/baselines/reference/superAccess.js      |   4 +-
 tests/baselines/reference/superAccess2.js     |   4 +-
 .../reference/superAccessInFatArrow1.js       |   4 +-
 .../reference/superCallArgsMustMatch.js       |   4 +-
 .../reference/superCallAssignResult.js        |   4 +-
 ...allFromClassThatDerivesFromGenericType1.js |   2 +-
 ...allFromClassThatDerivesFromGenericType2.js |   2 +-
 ...eButWithIncorrectNumberOfTypeArguments1.js |   4 +-
 ...sFromGenericTypeButWithNoTypeArguments1.js |   4 +-
 ...ivesNonGenericTypeButWithTypeArguments1.js |   4 +-
 .../superCallFromClassThatHasNoBaseType1.js   |   4 +-
 .../superCallInConstructorWithNoBaseType.js   |   4 +-
 .../reference/superCallInNonStaticMethod.js   |   4 +-
 .../reference/superCallInStaticMethod.js      |   4 +-
 .../superCallInsideClassDeclaration.js        |   8 +-
 .../superCallInsideClassExpression.js         |   8 +-
 .../superCallInsideObjectLiteralExpression.js |   4 +-
 .../reference/superCallOutsideConstructor.js  |   4 +-
 .../superCallParameterContextualTyping1.js    |   4 +-
 .../superCallParameterContextualTyping2.js    |   4 +-
 .../superCallParameterContextualTyping3.js    |   4 +-
 .../superCallWithMissingBaseClass.js          |   2 +-
 tests/baselines/reference/superCalls.js       |   8 +-
 .../reference/superCallsInConstructor.js      |   6 +-
 tests/baselines/reference/superErrors.js      |   4 +-
 .../baselines/reference/superInCatchBlock1.js |   4 +-
 .../reference/superInConstructorParam1.js     |   4 +-
 tests/baselines/reference/superInLambdas.js   |  10 +-
 tests/baselines/reference/superNewCall1.js    |   4 +-
 .../reference/superPropertyAccess.js          |   4 +-
 .../reference/superPropertyAccess1.js         |   4 +-
 .../reference/superPropertyAccess2.js         |   4 +-
 .../reference/superPropertyAccessNoError.js   |   4 +-
 .../reference/superSymbolIndexedAccess5.js    |   4 +-
 .../reference/superSymbolIndexedAccess6.js    |   4 +-
 .../superWithGenericSpecialization.js         |   4 +-
 .../baselines/reference/superWithGenerics.js  |   2 +-
 .../reference/superWithTypeArgument.js        |   4 +-
 .../reference/superWithTypeArgument2.js       |   4 +-
 .../reference/superWithTypeArgument3.js       |   4 +-
 ...side-object-literal-getters-and-setters.js |   4 +-
 .../reference/switchAssignmentCompat.js       |   2 +-
 .../switchCasesExpressionTypeMismatch.js      |   2 +-
 tests/baselines/reference/switchStatements.js |   4 +-
 tests/baselines/reference/systemModule17.js   |   2 +-
 tests/baselines/reference/systemModule3.js    |   4 +-
 tests/baselines/reference/systemModule6.js    |   2 +-
 .../systemModuleDeclarationMerging.js         |   2 +-
 .../reference/systemModuleExportDefault.js    |   4 +-
 .../systemModuleNonTopLevelModuleMembers.js   |   4 +-
 .../reference/systemModuleWithSuperClass.js   |   4 +-
 .../reference/targetTypeBaseCalls.js          |   4 +-
 ...emplateStringsArrayTypeDefinedInES5Mode.js |   2 +-
 .../baselines/reference/testContainerList.js  |   2 +-
 tests/baselines/reference/thisBinding.js      |   4 +-
 tests/baselines/reference/thisBinding2.js     |   2 +-
 tests/baselines/reference/thisCapture1.js     |   2 +-
 ...essionInCallExpressionWithTypeArguments.js |   2 +-
 .../thisExpressionOfGenericObject.js          |   2 +-
 tests/baselines/reference/thisInAccessors.js  |   6 +-
 ...thisInArrowFunctionInStaticInitializer1.js |   2 +-
 .../reference/thisInConstructorParameter1.js  |   2 +-
 .../reference/thisInConstructorParameter2.js  |   2 +-
 .../reference/thisInGenericStaticMembers.js   |   4 +-
 .../reference/thisInInnerFunctions.js         |   2 +-
 .../thisInInstanceMemberInitializer.js        |   4 +-
 .../reference/thisInInvalidContexts.js        |  10 +-
 .../thisInInvalidContextsExternalModule.js    |  10 +-
 tests/baselines/reference/thisInLambda.js     |   4 +-
 .../reference/thisInObjectLiterals.js         |   2 +-
 .../reference/thisInOuterClassBody.js         |   2 +-
 .../thisInPropertyBoundDeclarations.js        |   6 +-
 .../reference/thisInStaticMethod1.js          |   2 +-
 tests/baselines/reference/thisInStatics.js    |   2 +-
 tests/baselines/reference/thisInSuperCall.js  |   8 +-
 tests/baselines/reference/thisInSuperCall1.js |   4 +-
 tests/baselines/reference/thisInSuperCall2.js |   6 +-
 tests/baselines/reference/thisInSuperCall3.js |   4 +-
 .../reference/thisTypeAndConstraints.js       |   4 +-
 tests/baselines/reference/thisTypeErrors.js   |   6 +-
 tests/baselines/reference/thisTypeErrors2.js  |   6 +-
 .../baselines/reference/thisTypeInClasses.js  |   8 +-
 .../reference/thisWhenTypeCheckFails.js       |   2 +-
 .../reference/throwInEnclosingStatements.js   |   2 +-
 tests/baselines/reference/throwStatements.js  |   6 +-
 .../reference/tooManyTypeParameters1.js       |   2 +-
 tests/baselines/reference/topLevel.js         |   2 +-
 ...railingCommaInHeterogenousArrayLiteral1.js |   2 +-
 .../transitiveTypeArgumentInference1.js       |   2 +-
 .../reference/tsxAttributeResolution10.js     |   2 +-
 .../reference/tsxAttributeResolution9.js      |   2 +-
 .../reference/tsxElementResolution.js         |   6 +-
 .../reference/tsxElementResolution19.js       |   2 +-
 tests/baselines/reference/tsxEmit1.js         |   2 +-
 tests/baselines/reference/tsxEmit3.js         |   4 +-
 .../reference/tsxEmit3.sourcemap.txt          |   4 +-
 .../reference/tsxExternalModuleEmit1.js       |   4 +-
 tests/baselines/reference/tsxReactEmit1.js    |   2 +-
 .../tsxStatelessFunctionComponents2.js        |   2 +-
 tests/baselines/reference/tsxTypeErrors.js    |   2 +-
 .../reference/twoAccessorsWithSameName.js     |   6 +-
 .../reference/twoAccessorsWithSameName2.js    |   6 +-
 tests/baselines/reference/typeAliases.js      |   2 +-
 .../reference/typeAliasesForObjectTypes.js    |   2 +-
 .../typeArgumentInferenceOrdering.js          |   2 +-
 ...peArgumentInferenceWithClassExpression1.js |   4 +-
 ...peArgumentInferenceWithClassExpression2.js |   4 +-
 ...peArgumentInferenceWithClassExpression3.js |   4 +-
 tests/baselines/reference/typeAssertions.js   |   6 +-
 .../reference/typeCheckTypeArgument.js        |   4 +-
 .../typeConstraintsWithConstructSignatures.js |   2 +-
 .../baselines/reference/typeGuardFunction.js  |   8 +-
 .../reference/typeGuardFunctionErrors.js      |   8 +-
 .../reference/typeGuardFunctionGenerics.js    |   6 +-
 tests/baselines/reference/typeGuardInClass.js |   4 +-
 .../reference/typeGuardOfFormExpr1AndExpr2.js |   2 +-
 .../reference/typeGuardOfFormExpr1OrExpr2.js  |   2 +-
 .../reference/typeGuardOfFormInstanceOf.js    |   8 +-
 .../reference/typeGuardOfFormIsType.js        |   6 +-
 .../reference/typeGuardOfFormTypeOfBoolean.js |   2 +-
 ...eGuardOfFormTypeOfEqualEqualHasNoEffect.js |   2 +-
 ...ypeGuardOfFormTypeOfNotEqualHasNoEffect.js |   2 +-
 .../reference/typeGuardOfFormTypeOfNumber.js  |   2 +-
 .../reference/typeGuardOfFormTypeOfOther.js   |   2 +-
 .../reference/typeGuardOfFormTypeOfString.js  |   2 +-
 .../reference/typeGuardsInClassAccessors.js   |   2 +-
 .../reference/typeGuardsInClassMethods.js     |   2 +-
 .../reference/typeGuardsInProperties.js       |   2 +-
 .../reference/typeGuardsOnClassProperty.js    |   2 +-
 .../reference/typeIdentityConsidersBrands.js  |   8 +-
 .../typeInferenceReturnTypeCallback.js        |   4 +-
 tests/baselines/reference/typeMatch1.js       |   4 +-
 tests/baselines/reference/typeMatch2.js       |   4 +-
 tests/baselines/reference/typeName1.js        |   2 +-
 tests/baselines/reference/typeOfPrototype.js  |   2 +-
 tests/baselines/reference/typeOfSuperCall.js  |   4 +-
 tests/baselines/reference/typeOfThis.js       |   4 +-
 .../reference/typeOfThisInAccessor.js         |   4 +-
 .../typeOfThisInConstructorParamList.js       |   2 +-
 .../typeOfThisInFunctionExpression.js         |   2 +-
 .../reference/typeOfThisInInstanceMember.js   |   2 +-
 .../reference/typeOfThisInInstanceMember2.js  |   2 +-
 .../reference/typeOfThisInMemberFunctions.js  |   6 +-
 .../reference/typeOfThisInStaticMembers.js    |   4 +-
 .../reference/typeOfThisInStaticMembers2.js   |   4 +-
 .../reference/typeOfThisInStatics.js          |   2 +-
 .../typeParamExtendsOtherTypeParam.js         |   4 +-
 .../reference/typeParameterAsBaseClass.js     |   4 +-
 .../reference/typeParameterAsBaseType.js      |   4 +-
 .../reference/typeParameterAsTypeArgument.js  |   2 +-
 .../reference/typeParameterAssignability3.js  |   4 +-
 .../typeParameterAssignmentCompat1.js         |   2 +-
 ...ypeParameterDirectlyConstrainedToItself.js |   4 +-
 .../reference/typeParameterExtendingUnion1.js |   6 +-
 .../reference/typeParameterExtendingUnion2.js |   6 +-
 .../reference/typeParameterInConstraint1.js   |   2 +-
 ...eParameterIndirectlyConstrainedToItself.js |   6 +-
 .../typeParameterListWithTrailingComma1.js    |   2 +-
 .../typeParameterUsedAsConstraint.js          |  12 +-
 ...ParameterUsedAsTypeParameterConstraint4.js |   2 +-
 .../typeParameterWithInvalidConstraintType.js |   2 +-
 ...eParametersAndParametersInComputedNames.js |   2 +-
 .../typeParametersAreIdenticalToThemselves.js |   4 +-
 .../typeParametersAvailableInNestedScope.js   |   2 +-
 .../typeParametersInStaticAccessors.js        |   2 +-
 .../typeParametersInStaticMethods.js          |   2 +-
 .../typeParametersInStaticProperties.js       |   2 +-
 tests/baselines/reference/typeQueryOnClass.js |   4 +-
 .../reference/typeQueryWithReservedWords.js   |   2 +-
 .../baselines/reference/typeRelationships.js  |   4 +-
 tests/baselines/reference/typeResolution.js   |  20 +-
 .../reference/typeResolution.sourcemap.txt    |  20 +-
 .../baselines/reference/typeValueConflict1.js |   4 +-
 .../baselines/reference/typeValueConflict2.js |   6 +-
 .../reference/typedGenericPrototypeMember.js  |   2 +-
 .../reference/typeofANonExportedType.js       |   6 +-
 .../reference/typeofAmbientExternalModules.js |   4 +-
 .../reference/typeofAnExportedType.js         |   6 +-
 tests/baselines/reference/typeofClass.js      |   2 +-
 tests/baselines/reference/typeofClass2.js     |   4 +-
 .../reference/typeofClassWithPrivates.js      |   2 +-
 .../reference/typeofExternalModules.js        |   4 +-
 .../reference/typeofInternalModules.js        |   2 +-
 .../reference/typeofModuleWithoutExports.js   |   2 +-
 .../typeofOperatorWithAnyOtherType.js         |   2 +-
 .../typeofOperatorWithBooleanType.js          |   2 +-
 .../reference/typeofOperatorWithNumberType.js |   2 +-
 .../reference/typeofOperatorWithStringType.js |   2 +-
 tests/baselines/reference/typeofProperty.js   |   8 +-
 .../typesWithDuplicateTypeParameters.js       |   4 +-
 .../reference/typesWithPrivateConstructor.js  |   4 +-
 .../reference/typesWithPublicConstructor.js   |   4 +-
 .../typesWithSpecializedCallSignatures.js     |   8 +-
 ...typesWithSpecializedConstructSignatures.js |   8 +-
 tests/baselines/reference/undeclaredBase.js   |   2 +-
 tests/baselines/reference/undeclaredMethod.js |   2 +-
 .../undefinedAssignableToEveryType.js         |   2 +-
 .../undefinedIsSubtypeOfEverything.js         |  48 ++--
 .../reference/undefinedTypeAssignment4.js     |   2 +-
 .../baselines/reference/underscoreMapFirst.js |   2 +-
 .../unexpectedStatementBlockTerminator.js     |   4 +-
 .../unexportedInstanceClassVariables.js       |   4 +-
 ...nSubtypeIfEveryConstituentTypeIsSubtype.js |   6 +-
 .../reference/unionTypeEquivalence.js         |   4 +-
 .../reference/unionTypeFromArrayLiteral.js    |   8 +-
 .../unionTypePropertyAccessibility.js         |   8 +-
 ...unionTypeWithRecursiveSubtypeReduction1.js |   8 +-
 ...unionTypeWithRecursiveSubtypeReduction2.js |   8 +-
 .../reference/unionTypesAssignability.js      |   6 +-
 .../unknownSymbolInGenericReturnType.js       |   2 +-
 tests/baselines/reference/unknownSymbols1.js  |  10 +-
 .../reference/unknownTypeArgOnCall.js         |   2 +-
 .../unqualifiedCallToClassStatic1.js          |   2 +-
 .../reference/unspecializedConstraints.js     |  10 +-
 ...untypedFunctionCallsWithTypeParameters1.js |   4 +-
 .../reference/unusedImportDeclaration.js      |   2 +-
 ...ngModuleWithExportImportInValuePosition.js |   2 +-
 .../reference/validNullAssignments.js         |   2 +-
 .../reference/validUndefinedAssignments.js    |   2 +-
 .../reference/validUseOfThisInSuper.js        |   4 +-
 .../varArgConstructorMemberParameter.js       |   6 +-
 .../reference/varArgsOnConstructorTypes.js    |   4 +-
 tests/baselines/reference/varAsID.js          |   4 +-
 tests/baselines/reference/vararg.js           |   2 +-
 tests/baselines/reference/vardecl.js          |   4 +-
 ...eclaratorResolvedDuringContextualTyping.js |   4 +-
 tests/baselines/reference/visSyntax.js        |   2 +-
 .../reference/visibilityOfTypeParameters.js   |   2 +-
 .../reference/voidOperatorWithAnyOtherType.js |   2 +-
 .../reference/voidOperatorWithBooleanType.js  |   2 +-
 .../reference/voidOperatorWithNumberType.js   |   2 +-
 .../reference/voidOperatorWithStringType.js   |   2 +-
 tests/baselines/reference/withImportDecl.js   |   2 +-
 .../reference/withStatementErrors.js          |   2 +-
 tests/baselines/reference/witness.js          |   8 +-
 .../wrappedAndRecursiveConstraints.js         |   2 +-
 .../wrappedAndRecursiveConstraints2.js        |   2 +-
 .../wrappedAndRecursiveConstraints3.js        |   2 +-
 .../wrappedAndRecursiveConstraints4.js        |   2 +-
 2340 files changed, 5653 insertions(+), 5653 deletions(-)

diff --git a/tests/baselines/reference/2dArrays.js b/tests/baselines/reference/2dArrays.js
index fe8ab380ba7ba..62133e770ff9f 100644
--- a/tests/baselines/reference/2dArrays.js
+++ b/tests/baselines/reference/2dArrays.js
@@ -20,12 +20,12 @@ var Cell = (function () {
     function Cell() {
     }
     return Cell;
-})();
+}());
 var Ship = (function () {
     function Ship() {
     }
     return Ship;
-})();
+}());
 var Board = (function () {
     function Board() {
     }
@@ -33,4 +33,4 @@ var Board = (function () {
         return this.ships.every(function (val) { return val.isSunk; });
     };
     return Board;
-})();
+}());
diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js
index c72ca4b114b1d..ca67e5a70c263 100644
--- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js
+++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js
@@ -31,7 +31,7 @@ var A;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
 })(A || (A = {}));
 //// [test.js]
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js
index b27c2ce5a3036..bf9875efe304f 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.js
@@ -55,7 +55,7 @@ var clodule1 = (function () {
     function clodule1() {
     }
     return clodule1;
-})();
+}());
 var clodule1;
 (function (clodule1) {
     function f(x) { }
@@ -64,7 +64,7 @@ var clodule2 = (function () {
     function clodule2() {
     }
     return clodule2;
-})();
+}());
 var clodule2;
 (function (clodule2) {
     var x;
@@ -72,13 +72,13 @@ var clodule2;
         function D() {
         }
         return D;
-    })();
+    }());
 })(clodule2 || (clodule2 = {}));
 var clodule3 = (function () {
     function clodule3() {
     }
     return clodule3;
-})();
+}());
 var clodule3;
 (function (clodule3) {
     clodule3.y = { id: T };
@@ -87,12 +87,12 @@ var clodule4 = (function () {
     function clodule4() {
     }
     return clodule4;
-})();
+}());
 var clodule4;
 (function (clodule4) {
     var D = (function () {
         function D() {
         }
         return D;
-    })();
+    }());
 })(clodule4 || (clodule4 = {}));
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js
index 255e74631a3d3..dc6c6f6ee8e51 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndGenericClassStaticFunctionOfTheSameName.js
@@ -21,7 +21,7 @@ var clodule = (function () {
     }
     clodule.fn = function (id) { };
     return clodule;
-})();
+}());
 var clodule;
 (function (clodule) {
     // error: duplicate identifier expected
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js
index 76ba858306c70..402e0e6ad09dd 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedGenericFunctionAndNonGenericClassStaticFunctionOfTheSameName.js
@@ -21,7 +21,7 @@ var clodule = (function () {
     }
     clodule.fn = function (id) { };
     return clodule;
-})();
+}());
 var clodule;
 (function (clodule) {
     // error: duplicate identifier expected
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js
index 5f01b6acff1ba..0b6c868128e39 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModulesExportedStaticFunctionUsingClassPrivateStatics.js
@@ -21,7 +21,7 @@ var clodule = (function () {
     }
     clodule.sfn = function (id) { return 42; };
     return clodule;
-})();
+}());
 var clodule;
 (function (clodule) {
     // error: duplicate identifier expected
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js
index a86bc7d2e904a..d971dd160db6a 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js
@@ -30,7 +30,7 @@ var Point = (function () {
     }
     Point.Origin = function () { return { x: 0, y: 0 }; }; // unexpected error here bug 840246
     return Point;
-})();
+}());
 var Point;
 (function (Point) {
     function Origin() { return null; }
@@ -45,7 +45,7 @@ var A;
         }
         Point.Origin = function () { return { x: 0, y: 0 }; }; // unexpected error here bug 840246
         return Point;
-    })();
+    }());
     A.Point = Point;
     var Point;
     (function (Point) {
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js
index f462ea9eaa92d..3fcbdefdf7e6c 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js
@@ -30,7 +30,7 @@ var Point = (function () {
     }
     Point.Origin = function () { return { x: 0, y: 0 }; };
     return Point;
-})();
+}());
 var Point;
 (function (Point) {
     function Origin() { return ""; } // not an error, since not exported
@@ -44,7 +44,7 @@ var A;
         }
         Point.Origin = function () { return { x: 0, y: 0 }; };
         return Point;
-    })();
+    }());
     A.Point = Point;
     var Point;
     (function (Point) {
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js
index 45958ad62d4dc..a0cb50e73826c 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js
@@ -30,7 +30,7 @@ var Point = (function () {
     }
     Point.Origin = { x: 0, y: 0 };
     return Point;
-})();
+}());
 var Point;
 (function (Point) {
     Point.Origin = ""; //expected duplicate identifier error
@@ -44,7 +44,7 @@ var A;
         }
         Point.Origin = { x: 0, y: 0 };
         return Point;
-    })();
+    }());
     A.Point = Point;
     var Point;
     (function (Point) {
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js
index ae56fd1acdcb5..3bbf3b98d6ec3 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js
@@ -30,7 +30,7 @@ var Point = (function () {
     }
     Point.Origin = { x: 0, y: 0 };
     return Point;
-})();
+}());
 var Point;
 (function (Point) {
     var Origin = ""; // not an error, since not exported
@@ -44,7 +44,7 @@ var A;
         }
         Point.Origin = { x: 0, y: 0 };
         return Point;
-    })();
+    }());
     A.Point = Point;
     var Point;
     (function (Point) {
diff --git a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js
index 54666ca7aff92..247dc4fe62d94 100644
--- a/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js
+++ b/tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js
@@ -51,7 +51,7 @@ var X;
                 this.y = y;
             }
             return Point;
-        })();
+        }());
         Y.Point = Point;
     })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
@@ -75,7 +75,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var A;
 (function (A) {
     A.Instance = new A();
diff --git a/tests/baselines/reference/ClassDeclaration10.js b/tests/baselines/reference/ClassDeclaration10.js
index 3b1ae507e874f..6c56000948964 100644
--- a/tests/baselines/reference/ClassDeclaration10.js
+++ b/tests/baselines/reference/ClassDeclaration10.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclaration11.js b/tests/baselines/reference/ClassDeclaration11.js
index 6284af0767696..28705f5dfe02c 100644
--- a/tests/baselines/reference/ClassDeclaration11.js
+++ b/tests/baselines/reference/ClassDeclaration11.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype.foo = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclaration13.js b/tests/baselines/reference/ClassDeclaration13.js
index 7791b77eae669..faabbb3b3c20d 100644
--- a/tests/baselines/reference/ClassDeclaration13.js
+++ b/tests/baselines/reference/ClassDeclaration13.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype.bar = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclaration14.js b/tests/baselines/reference/ClassDeclaration14.js
index 7ae79132b9e55..ab08fd56c34e0 100644
--- a/tests/baselines/reference/ClassDeclaration14.js
+++ b/tests/baselines/reference/ClassDeclaration14.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclaration15.js b/tests/baselines/reference/ClassDeclaration15.js
index d40b5855bba06..39c2b7280492c 100644
--- a/tests/baselines/reference/ClassDeclaration15.js
+++ b/tests/baselines/reference/ClassDeclaration15.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclaration21.js b/tests/baselines/reference/ClassDeclaration21.js
index b5144b607d1d5..00bd52cf0bad1 100644
--- a/tests/baselines/reference/ClassDeclaration21.js
+++ b/tests/baselines/reference/ClassDeclaration21.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype[1] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclaration22.js b/tests/baselines/reference/ClassDeclaration22.js
index 0074813e77eab..2e9c98d8da3c7 100644
--- a/tests/baselines/reference/ClassDeclaration22.js
+++ b/tests/baselines/reference/ClassDeclaration22.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype["bar"] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclaration24.js b/tests/baselines/reference/ClassDeclaration24.js
index 2043c6c163c80..25bf0d144875a 100644
--- a/tests/baselines/reference/ClassDeclaration24.js
+++ b/tests/baselines/reference/ClassDeclaration24.js
@@ -7,4 +7,4 @@ var any = (function () {
     function any() {
     }
     return any;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclaration25.js b/tests/baselines/reference/ClassDeclaration25.js
index c39aa39eeed0e..26c2988ab47cb 100644
--- a/tests/baselines/reference/ClassDeclaration25.js
+++ b/tests/baselines/reference/ClassDeclaration25.js
@@ -14,4 +14,4 @@ var List = (function () {
     function List() {
     }
     return List;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclaration26.js b/tests/baselines/reference/ClassDeclaration26.js
index b08795021193c..97e1428132e57 100644
--- a/tests/baselines/reference/ClassDeclaration26.js
+++ b/tests/baselines/reference/ClassDeclaration26.js
@@ -11,5 +11,5 @@ var C = (function () {
         this.foo = 10;
     }
     return C;
-})();
+}());
 var constructor = function () { };
diff --git a/tests/baselines/reference/ClassDeclaration8.js b/tests/baselines/reference/ClassDeclaration8.js
index 320fdf76205eb..ec065a6cc4727 100644
--- a/tests/baselines/reference/ClassDeclaration8.js
+++ b/tests/baselines/reference/ClassDeclaration8.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclaration9.js b/tests/baselines/reference/ClassDeclaration9.js
index 102715d8c165e..30e9c66be8fc2 100644
--- a/tests/baselines/reference/ClassDeclaration9.js
+++ b/tests/baselines/reference/ClassDeclaration9.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js
index b8c4dbdf43391..d5c3b3d63f4fc 100644
--- a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js
+++ b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration.js
@@ -9,4 +9,4 @@ var AtomicNumbers = (function () {
     }
     AtomicNumbers.H = 1;
     return AtomicNumbers;
-})();
+}());
diff --git a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.js b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.js
index bd1f1e0c67496..7dda5cb832e30 100644
--- a/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.js
+++ b/tests/baselines/reference/ClassDeclarationWithInvalidConstOnPropertyDeclaration2.js
@@ -10,4 +10,4 @@ var C = (function () {
         this.x = 10;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ES5For-ofTypeCheck10.js b/tests/baselines/reference/ES5For-ofTypeCheck10.js
index ffef1fde8f8f9..0fe92e289a6e1 100644
--- a/tests/baselines/reference/ES5For-ofTypeCheck10.js
+++ b/tests/baselines/reference/ES5For-ofTypeCheck10.js
@@ -32,4 +32,4 @@ var StringIterator = (function () {
         return this;
     };
     return StringIterator;
-})();
+}());
diff --git a/tests/baselines/reference/ES5SymbolProperty2.js b/tests/baselines/reference/ES5SymbolProperty2.js
index effd1e610f4c8..f04a4671d3f18 100644
--- a/tests/baselines/reference/ES5SymbolProperty2.js
+++ b/tests/baselines/reference/ES5SymbolProperty2.js
@@ -19,7 +19,7 @@ var M;
         }
         C.prototype[Symbol.iterator] = function () { };
         return C;
-    })();
+    }());
     M.C = C;
     (new C)[Symbol.iterator];
 })(M || (M = {}));
diff --git a/tests/baselines/reference/ES5SymbolProperty3.js b/tests/baselines/reference/ES5SymbolProperty3.js
index 52ea7e091ee47..6589858625c4c 100644
--- a/tests/baselines/reference/ES5SymbolProperty3.js
+++ b/tests/baselines/reference/ES5SymbolProperty3.js
@@ -14,5 +14,5 @@ var C = (function () {
     }
     C.prototype[Symbol.iterator] = function () { };
     return C;
-})();
+}());
 (new C)[Symbol.iterator];
diff --git a/tests/baselines/reference/ES5SymbolProperty4.js b/tests/baselines/reference/ES5SymbolProperty4.js
index ae8a539f351e3..eca71ac989c00 100644
--- a/tests/baselines/reference/ES5SymbolProperty4.js
+++ b/tests/baselines/reference/ES5SymbolProperty4.js
@@ -14,5 +14,5 @@ var C = (function () {
     }
     C.prototype[Symbol.iterator] = function () { };
     return C;
-})();
+}());
 (new C)[Symbol.iterator];
diff --git a/tests/baselines/reference/ES5SymbolProperty5.js b/tests/baselines/reference/ES5SymbolProperty5.js
index 63b12667d0fb2..828d29abbfb02 100644
--- a/tests/baselines/reference/ES5SymbolProperty5.js
+++ b/tests/baselines/reference/ES5SymbolProperty5.js
@@ -14,5 +14,5 @@ var C = (function () {
     }
     C.prototype[Symbol.iterator] = function () { };
     return C;
-})();
+}());
 (new C)[Symbol.iterator](0); // Should error
diff --git a/tests/baselines/reference/ES5SymbolProperty6.js b/tests/baselines/reference/ES5SymbolProperty6.js
index 10eda091e5e1a..1a9ab2734119d 100644
--- a/tests/baselines/reference/ES5SymbolProperty6.js
+++ b/tests/baselines/reference/ES5SymbolProperty6.js
@@ -11,5 +11,5 @@ var C = (function () {
     }
     C.prototype[Symbol.iterator] = function () { };
     return C;
-})();
+}());
 (new C)[Symbol.iterator];
diff --git a/tests/baselines/reference/ES5SymbolProperty7.js b/tests/baselines/reference/ES5SymbolProperty7.js
index d3f796ce758fc..439a2b5bd0ea3 100644
--- a/tests/baselines/reference/ES5SymbolProperty7.js
+++ b/tests/baselines/reference/ES5SymbolProperty7.js
@@ -14,5 +14,5 @@ var C = (function () {
     }
     C.prototype[Symbol.iterator] = function () { };
     return C;
-})();
+}());
 (new C)[Symbol.iterator];
diff --git a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js
index 4ca0b4cd5f740..e6a0eb0584d72 100644
--- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js
+++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.js
@@ -30,7 +30,7 @@ var enumdule;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     enumdule.Point = Point;
 })(enumdule || (enumdule = {}));
 var x;
diff --git a/tests/baselines/reference/ExportAssignment7.js b/tests/baselines/reference/ExportAssignment7.js
index ae534c9255b6e..d6b3710161914 100644
--- a/tests/baselines/reference/ExportAssignment7.js
+++ b/tests/baselines/reference/ExportAssignment7.js
@@ -10,5 +10,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 exports.C = C;
diff --git a/tests/baselines/reference/ExportAssignment8.js b/tests/baselines/reference/ExportAssignment8.js
index be95e66948379..8cdff41505e49 100644
--- a/tests/baselines/reference/ExportAssignment8.js
+++ b/tests/baselines/reference/ExportAssignment8.js
@@ -10,5 +10,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 exports.C = C;
diff --git a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js
index 5ee537f568eea..0d8fbb8eb30e9 100644
--- a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js
+++ b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.js
@@ -31,6 +31,6 @@ var A;
             return 1;
         };
         return Point2d;
-    })();
+    }());
     A.Point2d = Point2d;
 })(A || (A = {}));
diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
index 3e48462062d82..7dcbfef1d727d 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
@@ -32,7 +32,7 @@ var A;
         function Point() {
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
     A.Origin = { x: 0, y: 0 };
     var Point3d = (function (_super) {
@@ -41,7 +41,7 @@ var A;
             _super.apply(this, arguments);
         }
         return Point3d;
-    })(Point);
+    }(Point));
     A.Point3d = Point3d;
     A.Origin3d = { x: 0, y: 0, z: 0 };
     var Line = (function () {
@@ -50,6 +50,6 @@ var A;
             this.end = end;
         }
         return Line;
-    })();
+    }());
     A.Line = Line;
 })(A || (A = {}));
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js
index 687600364fc3a..0496e349fa65c 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.js
@@ -22,11 +22,11 @@ var A;
         function Point() {
         }
         return Point;
-    })();
+    }());
     var points = (function () {
         function points() {
         }
         return points;
-    })();
+    }());
     A.points = points;
 })(A || (A = {}));
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
index a1386033e9fc4..8f175621af44a 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
@@ -36,7 +36,7 @@ var A;
         function Point() {
         }
         return Point;
-    })();
+    }());
     A.Origin = { x: 0, y: 0 };
     var Point3d = (function (_super) {
         __extends(Point3d, _super);
@@ -44,7 +44,7 @@ var A;
             _super.apply(this, arguments);
         }
         return Point3d;
-    })(Point);
+    }(Point));
     A.Point3d = Point3d;
     A.Origin3d = { x: 0, y: 0, z: 0 };
     var Line = (function () {
@@ -56,6 +56,6 @@ var A;
             return null;
         };
         return Line;
-    })();
+    }());
     A.Line = Line;
 })(A || (A = {}));
diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js
index 21d969d242c79..421c896539b5b 100644
--- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js
+++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.js
@@ -22,7 +22,7 @@ var A;
         function Point() {
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
     var Line = (function () {
         function Line(start, end) {
@@ -30,7 +30,7 @@ var A;
             this.end = end;
         }
         return Line;
-    })();
+    }());
     A.Line = Line;
     function fromOrigin(p) {
         return new Line({ x: 0, y: 0 }, p);
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js
index 99831f106299d..d33bcba793da8 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.js
@@ -22,14 +22,14 @@ var A;
         function Point() {
         }
         return Point;
-    })();
+    }());
     var Line = (function () {
         function Line(start, end) {
             this.start = start;
             this.end = end;
         }
         return Line;
-    })();
+    }());
     A.Line = Line;
     function fromOrigin(p) {
         return new Line({ x: 0, y: 0 }, p);
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js
index 3037e33d88007..dbd21ebe9e66f 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.js
@@ -22,7 +22,7 @@ var A;
         function Point() {
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
     var Line = (function () {
         function Line(start, end) {
@@ -30,7 +30,7 @@ var A;
             this.end = end;
         }
         return Line;
-    })();
+    }());
     function fromOrigin(p) {
         return new Line({ x: 0, y: 0 }, p);
     }
diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js
index df6645df3b324..b06288ae09315 100644
--- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js
+++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.js
@@ -29,7 +29,7 @@ var A;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
     var B;
     (function (B) {
@@ -41,7 +41,7 @@ var A;
                 return new Line({ x: 0, y: 0 }, p);
             };
             return Line;
-        })();
+        }());
         B.Line = Line;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js
index 46361dd41bb97..e9f3c10e189f4 100644
--- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js
+++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.js
@@ -20,7 +20,7 @@ var A;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     A.Origin = { x: 0, y: 0 };
     A.Unity = { start: new Point(0, 0), end: new Point(1, 0) };
 })(A || (A = {}));
diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js
index 44c19685743ac..7a480ed44730a 100644
--- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js
+++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInNestedMemberTypeAnnotations.js
@@ -20,6 +20,6 @@ var A;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     A.UnitSquare = null;
 })(A || (A = {}));
diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js
index b1769ba25f902..3c4b5bad16b78 100644
--- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js
+++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.js
@@ -15,6 +15,6 @@ var A;
         function B() {
         }
         return B;
-    })();
+    }());
     A.beez2 = new Array();
 })(A || (A = {}));
diff --git a/tests/baselines/reference/MemberAccessorDeclaration15.js b/tests/baselines/reference/MemberAccessorDeclaration15.js
index 85bbfa6223836..e2db7b2527e0e 100644
--- a/tests/baselines/reference/MemberAccessorDeclaration15.js
+++ b/tests/baselines/reference/MemberAccessorDeclaration15.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration1_es6.js b/tests/baselines/reference/MemberFunctionDeclaration1_es6.js
index 121376d526572..c69316783bdfc 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration1_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration1_es6.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype.foo = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration2_es6.js b/tests/baselines/reference/MemberFunctionDeclaration2_es6.js
index dcb494b3d130e..ce1781fcac240 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration2_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration2_es6.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype.foo = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration3_es6.js b/tests/baselines/reference/MemberFunctionDeclaration3_es6.js
index e858ab1558286..b32bd6bc57e3b 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration3_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration3_es6.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype[foo] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration4_es6.js b/tests/baselines/reference/MemberFunctionDeclaration4_es6.js
index 26b0868144188..abca2775ea0c2 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration4_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration4_es6.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype. = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration5_es6.js b/tests/baselines/reference/MemberFunctionDeclaration5_es6.js
index 6b43b18fe3925..2303c5e0f62ed 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration5_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration5_es6.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration6_es6.js b/tests/baselines/reference/MemberFunctionDeclaration6_es6.js
index ef9c924876353..b2a753d7ce068 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration6_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration6_es6.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration7_es6.js b/tests/baselines/reference/MemberFunctionDeclaration7_es6.js
index 8f942d87f9f08..a7d80ae974b83 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration7_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration7_es6.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype.foo = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/MemberFunctionDeclaration8_es6.js b/tests/baselines/reference/MemberFunctionDeclaration8_es6.js
index 8e23a5ec99576..8000a2d5c420f 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration8_es6.js
+++ b/tests/baselines/reference/MemberFunctionDeclaration8_es6.js
@@ -19,4 +19,4 @@ var C = (function () {
         return bar;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js
index e443596d483d0..cf26604952726 100644
--- a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js
+++ b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.js
@@ -54,7 +54,7 @@ var X;
                 this.y = y;
             }
             return Point;
-        })();
+        }());
         Y.Point = Point;
     })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
@@ -68,4 +68,4 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js
index 96df9812bc638..6928e189a07ae 100644
--- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js
+++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.js
@@ -25,7 +25,7 @@ var enumdule;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     enumdule.Point = Point;
 })(enumdule || (enumdule = {}));
 var enumdule;
diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js
index 06e5427a87958..185aa3c580e02 100644
--- a/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js
+++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedClasses.js
@@ -40,24 +40,24 @@ var A;
         function A() {
         }
         return A;
-    })();
+    }());
     A_1.A = A;
     var AG = (function () {
         function AG() {
         }
         return AG;
-    })();
+    }());
     A_1.AG = AG;
     var A2 = (function () {
         function A2() {
         }
         return A2;
-    })();
+    }());
     var AG2 = (function () {
         function AG2() {
         }
         return AG2;
-    })();
+    }());
 })(A || (A = {}));
 // no errors expected, these are all exported
 var a;
diff --git a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js
index e31ca5d5885d7..bdaff287a97be 100644
--- a/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js
+++ b/tests/baselines/reference/ModuleWithExportedAndNonExportedImportAlias.js
@@ -48,7 +48,7 @@ var B;
             this.end = end;
         }
         return Line;
-    })();
+    }());
     B.Line = Line;
 })(B || (B = {}));
 var Geometry;
diff --git a/tests/baselines/reference/NonInitializedExportInInternalModule.js b/tests/baselines/reference/NonInitializedExportInInternalModule.js
index e49bb20d3f017..aa1c84664ad07 100644
--- a/tests/baselines/reference/NonInitializedExportInInternalModule.js
+++ b/tests/baselines/reference/NonInitializedExportInInternalModule.js
@@ -45,7 +45,7 @@ var Inner;
         function A() {
         }
         return A;
-    })();
+    }());
     var B;
     (function (B) {
         B.a = 1, B.c = 2;
@@ -63,7 +63,7 @@ var Inner;
         function D() {
         }
         return D;
-    })();
+    }());
     Inner.e1 = new D;
     Inner.f1 = new D;
     Inner.g1 = new D;
diff --git a/tests/baselines/reference/ParameterList6.js b/tests/baselines/reference/ParameterList6.js
index 824b288572f21..e6238e3f0b8e8 100644
--- a/tests/baselines/reference/ParameterList6.js
+++ b/tests/baselines/reference/ParameterList6.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C(C) {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/ParameterList7.js b/tests/baselines/reference/ParameterList7.js
index 76adf8352b969..394d2cb733c70 100644
--- a/tests/baselines/reference/ParameterList7.js
+++ b/tests/baselines/reference/ParameterList7.js
@@ -11,4 +11,4 @@ var C1 = (function () {
         this.p3 = p3;
     } // OK
     return C1;
-})();
+}());
diff --git a/tests/baselines/reference/Protected1.js b/tests/baselines/reference/Protected1.js
index eebce2f4ecc80..57bd4175632ab 100644
--- a/tests/baselines/reference/Protected1.js
+++ b/tests/baselines/reference/Protected1.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/Protected3.js b/tests/baselines/reference/Protected3.js
index 4c4d5e2a12cf5..4171d64df7a09 100644
--- a/tests/baselines/reference/Protected3.js
+++ b/tests/baselines/reference/Protected3.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/Protected4.js b/tests/baselines/reference/Protected4.js
index 9c23a1be884ce..098fe70118da1 100644
--- a/tests/baselines/reference/Protected4.js
+++ b/tests/baselines/reference/Protected4.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype.m = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/Protected5.js b/tests/baselines/reference/Protected5.js
index 8426a8765d708..fe79c7399a3be 100644
--- a/tests/baselines/reference/Protected5.js
+++ b/tests/baselines/reference/Protected5.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.m = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/Protected6.js b/tests/baselines/reference/Protected6.js
index 10b595517373f..65a1eea3d6b1c 100644
--- a/tests/baselines/reference/Protected6.js
+++ b/tests/baselines/reference/Protected6.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.m = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/Protected7.js b/tests/baselines/reference/Protected7.js
index 16c24edb8cb4e..5232d932e9d30 100644
--- a/tests/baselines/reference/Protected7.js
+++ b/tests/baselines/reference/Protected7.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype.m = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/Protected9.js b/tests/baselines/reference/Protected9.js
index f747f18e8e8cc..d7c0d8eae2aa5 100644
--- a/tests/baselines/reference/Protected9.js
+++ b/tests/baselines/reference/Protected9.js
@@ -9,4 +9,4 @@ var C = (function () {
         this.p = p;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js
index deb2f3aa59d61..dd29b88421cb8 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.js
@@ -47,7 +47,7 @@ var A;
         function Point() {
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
 })(A || (A = {}));
 var A;
@@ -59,7 +59,7 @@ var A;
             return { x: p.x, y: p.y };
         };
         return Point;
-    })();
+    }());
 })(A || (A = {}));
 // ensure merges as expected
 var p;
@@ -74,7 +74,7 @@ var X;
                 function Line() {
                 }
                 return Line;
-            })();
+            }());
             Z.Line = Line;
         })(Z = Y.Z || (Y.Z = {}));
     })(Y = X.Y || (X.Y = {}));
@@ -89,7 +89,7 @@ var X;
                 function Line() {
                 }
                 return Line;
-            })();
+            }());
         })(Z = Y.Z || (Y.Z = {}));
     })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js
index 125a803ff3984..028934ae99f3e 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.js
@@ -66,7 +66,7 @@ var A;
                 this.br = br;
             }
             return Plane;
-        })();
+        }());
         Utils.Plane = Plane;
     })(Utils = A.Utils || (A.Utils = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js
index d2d5a15bde074..2a75b92e2db4f 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedClassesOfTheSameName.js
@@ -39,7 +39,7 @@ var A;
         function Point() {
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
 })(A || (A = {}));
 var A;
@@ -49,7 +49,7 @@ var A;
         function Point() {
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
 })(A || (A = {}));
 var X;
@@ -62,7 +62,7 @@ var X;
                 function Line() {
                 }
                 return Line;
-            })();
+            }());
             Z.Line = Line;
         })(Z = Y.Z || (Y.Z = {}));
     })(Y = X.Y || (X.Y = {}));
@@ -78,7 +78,7 @@ var X;
                 function Line() {
                 }
                 return Line;
-            })();
+            }());
             Z.Line = Line;
         })(Z = Y.Z || (Y.Z = {}));
     })(Y = X.Y || (X.Y = {}));
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
index d6bcc74154245..03a504a888aed 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.js
@@ -56,7 +56,7 @@ var A;
                 this.br = br;
             }
             return Plane;
-        })();
+        }());
         Utils.Plane = Plane;
     })(Utils = A.Utils || (A.Utils = {}));
 })(A = exports.A || (exports.A = {}));
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js
index de9f86084bc5e..54ffef5a084a0 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.js
@@ -60,7 +60,7 @@ var X;
                 function Line() {
                 }
                 return Line;
-            })();
+            }());
             Z.Line = Line;
         })(Z = Y.Z || (Y.Z = {}));
     })(Y = X.Y || (X.Y = {}));
@@ -75,7 +75,7 @@ var X;
                 function Line() {
                 }
                 return Line;
-            })();
+            }());
             Z.Line = Line;
         })(Z || (Z = {}));
     })(Y = X.Y || (X.Y = {}));
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js
index a854dff15c6a8..86a1190ed0673 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.js
@@ -59,7 +59,7 @@ var otherRoot;
                     this.br = br;
                 }
                 return Plane;
-            })();
+            }());
             Utils.Plane = Plane;
         })(Utils = A.Utils || (A.Utils = {}));
     })(A = otherRoot.A || (otherRoot.A = {}));
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js
index 82c9afd078717..c5c4cfdb2ca9b 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.js
@@ -62,7 +62,7 @@ var A;
                 this.br = br;
             }
             return Plane;
-        })();
+        }());
         Utils.Plane = Plane;
     })(Utils = A.Utils || (A.Utils = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/TypeGuardWithArrayUnion.js b/tests/baselines/reference/TypeGuardWithArrayUnion.js
index cf98d2c2453ba..8dc7207e9db74 100644
--- a/tests/baselines/reference/TypeGuardWithArrayUnion.js
+++ b/tests/baselines/reference/TypeGuardWithArrayUnion.js
@@ -15,7 +15,7 @@ var Message = (function () {
     function Message() {
     }
     return Message;
-})();
+}());
 function saySize(message) {
     if (message instanceof Array) {
         return message.length; // Should have type Message[] here
diff --git a/tests/baselines/reference/YieldExpression11_es6.js b/tests/baselines/reference/YieldExpression11_es6.js
index 07af8462a85c7..6260309473d85 100644
--- a/tests/baselines/reference/YieldExpression11_es6.js
+++ b/tests/baselines/reference/YieldExpression11_es6.js
@@ -13,4 +13,4 @@ var C = (function () {
         yield (foo);
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/YieldExpression12_es6.js b/tests/baselines/reference/YieldExpression12_es6.js
index ed9f8130bb324..7211d41cb86dc 100644
--- a/tests/baselines/reference/YieldExpression12_es6.js
+++ b/tests/baselines/reference/YieldExpression12_es6.js
@@ -11,4 +11,4 @@ var C = (function () {
         yield foo;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/YieldExpression14_es6.js b/tests/baselines/reference/YieldExpression14_es6.js
index a03d31998ffb3..e8c33c2085e15 100644
--- a/tests/baselines/reference/YieldExpression14_es6.js
+++ b/tests/baselines/reference/YieldExpression14_es6.js
@@ -13,4 +13,4 @@ var C = (function () {
         yield foo;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/accessOverriddenBaseClassMember1.js b/tests/baselines/reference/accessOverriddenBaseClassMember1.js
index e3a4d0602b8b2..c04532078e994 100644
--- a/tests/baselines/reference/accessOverriddenBaseClassMember1.js
+++ b/tests/baselines/reference/accessOverriddenBaseClassMember1.js
@@ -30,7 +30,7 @@ var Point = (function () {
         return "x=" + this.x + " y=" + this.y;
     };
     return Point;
-})();
+}());
 var ColoredPoint = (function (_super) {
     __extends(ColoredPoint, _super);
     function ColoredPoint(x, y, color) {
@@ -41,4 +41,4 @@ var ColoredPoint = (function (_super) {
         return _super.prototype.toString.call(this) + " color=" + this.color;
     };
     return ColoredPoint;
-})(Point);
+}(Point));
diff --git a/tests/baselines/reference/accessibilityModifiers.js b/tests/baselines/reference/accessibilityModifiers.js
index ebc801ac13651..c50092d1459b5 100644
--- a/tests/baselines/reference/accessibilityModifiers.js
+++ b/tests/baselines/reference/accessibilityModifiers.js
@@ -84,7 +84,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 // Errors, accessibility modifiers must precede static
 var D = (function () {
     function D() {
@@ -123,7 +123,7 @@ var D = (function () {
         configurable: true
     });
     return D;
-})();
+}());
 // Errors, multiple accessibility modifier
 var E = (function () {
     function E() {
@@ -140,4 +140,4 @@ var E = (function () {
         configurable: true
     });
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/accessorParameterAccessibilityModifier.js b/tests/baselines/reference/accessorParameterAccessibilityModifier.js
index 8b5ee6196e068..4aa8451feedfa 100644
--- a/tests/baselines/reference/accessorParameterAccessibilityModifier.js
+++ b/tests/baselines/reference/accessorParameterAccessibilityModifier.js
@@ -20,4 +20,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/accessorWithES3.js b/tests/baselines/reference/accessorWithES3.js
index 1eecaa68d6452..6384712fc9d85 100644
--- a/tests/baselines/reference/accessorWithES3.js
+++ b/tests/baselines/reference/accessorWithES3.js
@@ -34,7 +34,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -45,7 +45,7 @@ var D = (function () {
         configurable: true
     });
     return D;
-})();
+}());
 var x = {
     get a() { return 1; }
 };
diff --git a/tests/baselines/reference/accessorWithES5.js b/tests/baselines/reference/accessorWithES5.js
index 746703bce525c..3a94de769882b 100644
--- a/tests/baselines/reference/accessorWithES5.js
+++ b/tests/baselines/reference/accessorWithES5.js
@@ -31,7 +31,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -42,7 +42,7 @@ var D = (function () {
         configurable: true
     });
     return D;
-})();
+}());
 var x = {
     get a() { return 1; }
 };
diff --git a/tests/baselines/reference/accessorWithInitializer.js b/tests/baselines/reference/accessorWithInitializer.js
index 26e72fe7d7dec..d4562e635dce5 100644
--- a/tests/baselines/reference/accessorWithInitializer.js
+++ b/tests/baselines/reference/accessorWithInitializer.js
@@ -24,4 +24,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/accessorWithMismatchedAccessibilityModifiers.js b/tests/baselines/reference/accessorWithMismatchedAccessibilityModifiers.js
index 548d679776e30..9dc206971a121 100644
--- a/tests/baselines/reference/accessorWithMismatchedAccessibilityModifiers.js
+++ b/tests/baselines/reference/accessorWithMismatchedAccessibilityModifiers.js
@@ -46,7 +46,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -60,7 +60,7 @@ var D = (function () {
         configurable: true
     });
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
@@ -74,7 +74,7 @@ var E = (function () {
         configurable: true
     });
     return E;
-})();
+}());
 var F = (function () {
     function F() {
     }
@@ -88,4 +88,4 @@ var F = (function () {
         configurable: true
     });
     return F;
-})();
+}());
diff --git a/tests/baselines/reference/accessorWithRestParam.js b/tests/baselines/reference/accessorWithRestParam.js
index 9feafe1904db3..a58a7db1c5256 100644
--- a/tests/baselines/reference/accessorWithRestParam.js
+++ b/tests/baselines/reference/accessorWithRestParam.js
@@ -30,4 +30,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/accessorsAreNotContextuallyTyped.js b/tests/baselines/reference/accessorsAreNotContextuallyTyped.js
index 8c01173a13cec..9047eebae6610 100644
--- a/tests/baselines/reference/accessorsAreNotContextuallyTyped.js
+++ b/tests/baselines/reference/accessorsAreNotContextuallyTyped.js
@@ -28,6 +28,6 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var c;
 var r = c.x(''); // string
diff --git a/tests/baselines/reference/accessorsEmit.js b/tests/baselines/reference/accessorsEmit.js
index e2c097e263f82..7276c04e28e36 100644
--- a/tests/baselines/reference/accessorsEmit.js
+++ b/tests/baselines/reference/accessorsEmit.js
@@ -20,7 +20,7 @@ var Result = (function () {
     function Result() {
     }
     return Result;
-})();
+}());
 var Test = (function () {
     function Test() {
     }
@@ -33,7 +33,7 @@ var Test = (function () {
         configurable: true
     });
     return Test;
-})();
+}());
 var Test2 = (function () {
     function Test2() {
     }
@@ -46,4 +46,4 @@ var Test2 = (function () {
         configurable: true
     });
     return Test2;
-})();
+}());
diff --git a/tests/baselines/reference/accessorsNotAllowedInES3.js b/tests/baselines/reference/accessorsNotAllowedInES3.js
index 0843a39191cb9..e348771b8f6aa 100644
--- a/tests/baselines/reference/accessorsNotAllowedInES3.js
+++ b/tests/baselines/reference/accessorsNotAllowedInES3.js
@@ -16,5 +16,5 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var y = { get foo() { return 3; } };
diff --git a/tests/baselines/reference/accessors_spec_section-4.5_error-cases.js b/tests/baselines/reference/accessors_spec_section-4.5_error-cases.js
index 5e527aef3e924..2832e70e13875 100644
--- a/tests/baselines/reference/accessors_spec_section-4.5_error-cases.js
+++ b/tests/baselines/reference/accessors_spec_section-4.5_error-cases.js
@@ -42,4 +42,4 @@ var LanguageSpec_section_4_5_error_cases = (function () {
         configurable: true
     });
     return LanguageSpec_section_4_5_error_cases;
-})();
+}());
diff --git a/tests/baselines/reference/accessors_spec_section-4.5_inference.js b/tests/baselines/reference/accessors_spec_section-4.5_inference.js
index 808019448b7b6..7294aa1aff74a 100644
--- a/tests/baselines/reference/accessors_spec_section-4.5_inference.js
+++ b/tests/baselines/reference/accessors_spec_section-4.5_inference.js
@@ -34,14 +34,14 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var LanguageSpec_section_4_5_inference = (function () {
     function LanguageSpec_section_4_5_inference() {
     }
@@ -82,4 +82,4 @@ var LanguageSpec_section_4_5_inference = (function () {
         configurable: true
     });
     return LanguageSpec_section_4_5_inference;
-})();
+}());
diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js
index ed6c82bddd84e..c95256930420c 100644
--- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js
+++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.js
@@ -46,7 +46,7 @@ var C = (function () {
     }
     C.foo = function () { };
     return C;
-})();
+}());
 var E;
 (function (E) {
     E[E["a"] = 0] = "a";
diff --git a/tests/baselines/reference/additionOperatorWithInvalidOperands.js b/tests/baselines/reference/additionOperatorWithInvalidOperands.js
index 3eadd0138492a..897559b5cf322 100644
--- a/tests/baselines/reference/additionOperatorWithInvalidOperands.js
+++ b/tests/baselines/reference/additionOperatorWithInvalidOperands.js
@@ -47,7 +47,7 @@ var C = (function () {
     }
     C.foo = function () { };
     return C;
-})();
+}());
 var E;
 (function (E) {
     E[E["a"] = 0] = "a";
diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js
index 0c6ac09a382e0..7aef6de22e6df 100644
--- a/tests/baselines/reference/aliasAssignments.js
+++ b/tests/baselines/reference/aliasAssignments.js
@@ -19,7 +19,7 @@ var someClass = (function () {
     function someClass() {
     }
     return someClass;
-})();
+}());
 exports.someClass = someClass;
 //// [aliasAssignments_1.js]
 "use strict";
diff --git a/tests/baselines/reference/aliasBug.js b/tests/baselines/reference/aliasBug.js
index 870060fc5edb4..be7201a8ea78a 100644
--- a/tests/baselines/reference/aliasBug.js
+++ b/tests/baselines/reference/aliasBug.js
@@ -27,7 +27,7 @@ var foo;
         function Provide() {
         }
         return Provide;
-    })();
+    }());
     foo.Provide = Provide;
     var bar;
     (function (bar) {
@@ -37,7 +37,7 @@ var foo;
                 function boo() {
                 }
                 return boo;
-            })();
+            }());
             baz.boo = boo;
         })(baz = bar.baz || (bar.baz = {}));
     })(bar = foo.bar || (foo.bar = {}));
diff --git a/tests/baselines/reference/aliasErrors.js b/tests/baselines/reference/aliasErrors.js
index e61ca16766190..1e93d22c3fb44 100644
--- a/tests/baselines/reference/aliasErrors.js
+++ b/tests/baselines/reference/aliasErrors.js
@@ -37,7 +37,7 @@ var foo;
         function Provide() {
         }
         return Provide;
-    })();
+    }());
     foo.Provide = Provide;
     var bar;
     (function (bar) {
@@ -47,7 +47,7 @@ var foo;
                 function boo() {
                 }
                 return boo;
-            })();
+            }());
             baz.boo = boo;
         })(baz = bar.baz || (bar.baz = {}));
     })(bar = foo.bar || (foo.bar = {}));
diff --git a/tests/baselines/reference/aliasInaccessibleModule2.js b/tests/baselines/reference/aliasInaccessibleModule2.js
index b8b824d92ad9e..b16bcf6cd72ee 100644
--- a/tests/baselines/reference/aliasInaccessibleModule2.js
+++ b/tests/baselines/reference/aliasInaccessibleModule2.js
@@ -18,7 +18,7 @@ var M;
             function C() {
             }
             return C;
-        })();
+        }());
     })(N || (N = {}));
     var R = N;
     M.X = R;
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
index d067ca1c00aeb..905ed9bce0e58 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -33,7 +33,7 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 exports.Model = Model;
 //// [aliasUsage1_moduleA.js]
 "use strict";
@@ -49,7 +49,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsage1_main.js]
 "use strict";
@@ -68,4 +68,4 @@ var C2 = (function () {
         configurable: true
     });
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js
index 183a885b3c640..2d9f7cfed6ec4 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -27,7 +27,7 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 exports.Model = Model;
 //// [aliasUsageInArray_moduleA.js]
 "use strict";
@@ -43,7 +43,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInArray_main.js]
 "use strict";
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js
index 584c894cbad5d..21565dc99fc67 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -26,7 +26,7 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 exports.Model = Model;
 //// [aliasUsageInFunctionExpression_moduleA.js]
 "use strict";
@@ -42,7 +42,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInFunctionExpression_main.js]
 "use strict";
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js
index fe52d71bf3fca..af24b61cf3330 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -30,7 +30,7 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 exports.Model = Model;
 //// [aliasUsageInGenericFunction_moduleA.js]
 "use strict";
@@ -46,7 +46,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInGenericFunction_main.js]
 "use strict";
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
index e4448ef220faf..3b21f15777c90 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -32,7 +32,7 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 exports.Model = Model;
 //// [aliasUsageInIndexerOfClass_moduleA.js]
 "use strict";
@@ -48,7 +48,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInIndexerOfClass_main.js]
 "use strict";
@@ -58,9 +58,9 @@ var N = (function () {
         this.x = moduleA;
     }
     return N;
-})();
+}());
 var N2 = (function () {
     function N2() {
     }
     return N2;
-})();
+}());
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js
index b0abd11b189e4..b380104b461c1 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -27,7 +27,7 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 exports.Model = Model;
 //// [aliasUsageInObjectLiteral_moduleA.js]
 "use strict";
@@ -43,7 +43,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInObjectLiteral_main.js]
 "use strict";
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index ff8543bca7682..1e9a54203453f 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -30,7 +30,7 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 exports.Model = Model;
 //// [aliasUsageInOrExpression_moduleA.js]
 "use strict";
@@ -46,7 +46,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInOrExpression_main.js]
 "use strict";
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
index cf256e010eeab..76b90c01bf0e3 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -30,7 +30,7 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 exports.Model = Model;
 //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.js]
 "use strict";
@@ -46,7 +46,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInTypeArgumentOfExtendsClause_main.js]
 "use strict";
@@ -60,7 +60,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -68,4 +68,4 @@ var D = (function (_super) {
         this.x = moduleA;
     }
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js
index 8117aca8c355b..7c73fac2d67d5 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -26,7 +26,7 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 exports.Model = Model;
 //// [aliasUsageInVarAssignment_moduleA.js]
 "use strict";
@@ -42,7 +42,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [aliasUsageInVarAssignment_main.js]
 "use strict";
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js
index 699880f930ccb..3789410a54b5a 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports1.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js
@@ -16,7 +16,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 exports.Foo = Foo;
 //// [a.js]
 "use strict";
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports2.js b/tests/baselines/reference/allowSyntheticDefaultImports2.js
index d21750c65fc31..fcc029415cf84 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports2.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports2.js
@@ -20,7 +20,7 @@ System.register([], function(exports_1) {
                 function Foo() {
                 }
                 return Foo;
-            })();
+            }());
             exports_1("Foo", Foo);
         }
     }
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports3.js b/tests/baselines/reference/allowSyntheticDefaultImports3.js
index 8864a28e7960d..b14d25dbd61b0 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports3.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports3.js
@@ -21,7 +21,7 @@ System.register([], function(exports_1) {
                 function Foo() {
                 }
                 return Foo;
-            })();
+            }());
             exports_1("Foo", Foo);
         }
     }
diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
index a089cea155b11..b0382205cd3e7 100644
--- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
+++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
@@ -18,7 +18,7 @@ define(["require", "exports", "ext"], function (require, exports, ext) {
         function D() {
         }
         return D;
-    })();
+    }());
     var x = ext;
     return D;
 });
diff --git a/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.js b/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.js
index 2beabb83d11d9..06a558d1ba5e3 100644
--- a/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.js
+++ b/tests/baselines/reference/ambiguousCallsWhereReturnTypesAgree.js
@@ -38,7 +38,7 @@ var TestClass = (function () {
         this.bar(x); // should not error
     };
     return TestClass;
-})();
+}());
 var TestClass2 = (function () {
     function TestClass2() {
     }
@@ -49,4 +49,4 @@ var TestClass2 = (function () {
         return this.bar(x); // should not error
     };
     return TestClass2;
-})();
+}());
diff --git a/tests/baselines/reference/ambiguousOverloadResolution.js b/tests/baselines/reference/ambiguousOverloadResolution.js
index 23c985d2f8d8b..275bbf676024e 100644
--- a/tests/baselines/reference/ambiguousOverloadResolution.js
+++ b/tests/baselines/reference/ambiguousOverloadResolution.js
@@ -18,13 +18,13 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var x;
 var t = f(x, x); // Not an error
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
index 3f6bcebab533b..beb91191bc013 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
@@ -40,7 +40,7 @@ define(["require", "exports"], function (require, exports) {
         }
         C1.s1 = true;
         return C1;
-    })();
+    }());
     exports.C1 = C1;
     (function (E1) {
         E1[E1["A"] = 0] = "A";
diff --git a/tests/baselines/reference/amdModuleName1.js b/tests/baselines/reference/amdModuleName1.js
index ccfa8958575eb..f17166319c0b1 100644
--- a/tests/baselines/reference/amdModuleName1.js
+++ b/tests/baselines/reference/amdModuleName1.js
@@ -18,6 +18,6 @@ define("NamedModule", ["require", "exports"], function (require, exports) {
             this.x = 5;
         }
         return Foo;
-    })();
+    }());
     return Foo;
 });
diff --git a/tests/baselines/reference/amdModuleName2.js b/tests/baselines/reference/amdModuleName2.js
index ff547dd6c3bf5..4143183c6f53f 100644
--- a/tests/baselines/reference/amdModuleName2.js
+++ b/tests/baselines/reference/amdModuleName2.js
@@ -20,6 +20,6 @@ define("SecondModuleName", ["require", "exports"], function (require, exports) {
             this.x = 5;
         }
         return Foo;
-    })();
+    }());
     return Foo;
 });
diff --git a/tests/baselines/reference/anonterface.js b/tests/baselines/reference/anonterface.js
index 12bfbc4ec9d6a..041b90cb56cec 100644
--- a/tests/baselines/reference/anonterface.js
+++ b/tests/baselines/reference/anonterface.js
@@ -24,7 +24,7 @@ var M;
             return fn(n2);
         };
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
 var c = new M.C();
diff --git a/tests/baselines/reference/anonymousClassExpression1.js b/tests/baselines/reference/anonymousClassExpression1.js
index 5ced5120979fc..6774665ae6efe 100644
--- a/tests/baselines/reference/anonymousClassExpression1.js
+++ b/tests/baselines/reference/anonymousClassExpression1.js
@@ -9,5 +9,5 @@ function f() {
         function class_1() {
         }
         return class_1;
-    })() === "function";
+    }()) === "function";
 }
diff --git a/tests/baselines/reference/anyAsGenericFunctionCall.js b/tests/baselines/reference/anyAsGenericFunctionCall.js
index 64097f4e3c7ef..3c3eddccb1e81 100644
--- a/tests/baselines/reference/anyAsGenericFunctionCall.js
+++ b/tests/baselines/reference/anyAsGenericFunctionCall.js
@@ -20,6 +20,6 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = x(x);
 var d = x(x);
diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.js b/tests/baselines/reference/anyAssignabilityInInheritance.js
index 04e3e91761de3..f73228a464b17 100644
--- a/tests/baselines/reference/anyAssignabilityInInheritance.js
+++ b/tests/baselines/reference/anyAssignabilityInInheritance.js
@@ -103,13 +103,13 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var r3 = foo3(a); // any
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var r3 = foo3(a); // any
 var r3 = foo3(a); // any
 var r3 = foo3(a); // any
@@ -128,7 +128,7 @@ var CC = (function () {
     function CC() {
     }
     return CC;
-})();
+}());
 var CC;
 (function (CC) {
     CC.bar = 1;
diff --git a/tests/baselines/reference/anyAssignableToEveryType.js b/tests/baselines/reference/anyAssignableToEveryType.js
index 75d847709a53b..f02660e17ec56 100644
--- a/tests/baselines/reference/anyAssignableToEveryType.js
+++ b/tests/baselines/reference/anyAssignableToEveryType.js
@@ -51,7 +51,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var ac;
 var ai;
 var E;
diff --git a/tests/baselines/reference/anyAssignableToEveryType2.js b/tests/baselines/reference/anyAssignableToEveryType2.js
index 530d8eb043909..c5fefb600423c 100644
--- a/tests/baselines/reference/anyAssignableToEveryType2.js
+++ b/tests/baselines/reference/anyAssignableToEveryType2.js
@@ -136,12 +136,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var E;
 (function (E) {
     E[E["A"] = 0] = "A";
@@ -155,7 +155,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var c;
 (function (c) {
     c.bar = 1;
diff --git a/tests/baselines/reference/anyIdenticalToItself.js b/tests/baselines/reference/anyIdenticalToItself.js
index b7b9b25e41832..cfbaff6585cfb 100644
--- a/tests/baselines/reference/anyIdenticalToItself.js
+++ b/tests/baselines/reference/anyIdenticalToItself.js
@@ -28,4 +28,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/apparentTypeSubtyping.js b/tests/baselines/reference/apparentTypeSubtyping.js
index edc0f21323a15..2d04b059a9a9a 100644
--- a/tests/baselines/reference/apparentTypeSubtyping.js
+++ b/tests/baselines/reference/apparentTypeSubtyping.js
@@ -33,7 +33,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 // is String (S) a subtype of U extends String (T)? Would only be true if we used the apparent type of U (T)
 var Derived = (function (_super) {
     __extends(Derived, _super);
@@ -41,12 +41,12 @@ var Derived = (function (_super) {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
 // is U extends String (S) a subtype of String (T)? Apparent type of U is String so it succeeds
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
@@ -54,4 +54,4 @@ var Derived2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base2);
+}(Base2));
diff --git a/tests/baselines/reference/apparentTypeSupertype.js b/tests/baselines/reference/apparentTypeSupertype.js
index 2ab84c895135d..de1b1ba11bd72 100644
--- a/tests/baselines/reference/apparentTypeSupertype.js
+++ b/tests/baselines/reference/apparentTypeSupertype.js
@@ -23,7 +23,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 // is String (S) a subtype of U extends String (T)? Would only be true if we used the apparent type of U (T)
 var Derived = (function (_super) {
     __extends(Derived, _super);
@@ -31,4 +31,4 @@ var Derived = (function (_super) {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/argsInScope.js b/tests/baselines/reference/argsInScope.js
index 76b7ab0e99fdb..90906426d240e 100644
--- a/tests/baselines/reference/argsInScope.js
+++ b/tests/baselines/reference/argsInScope.js
@@ -20,6 +20,6 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
 var c = new C();
 c.P(1, 2, 3);
diff --git a/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.js b/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.js
index 47edef44ef092..753afb809a271 100644
--- a/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.js
+++ b/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.js
@@ -17,4 +17,4 @@ var A = (function () {
         };
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/arithAssignTyping.js b/tests/baselines/reference/arithAssignTyping.js
index 10e60bfb1f2f0..38f6718175bc1 100644
--- a/tests/baselines/reference/arithAssignTyping.js
+++ b/tests/baselines/reference/arithAssignTyping.js
@@ -19,7 +19,7 @@ var f = (function () {
     function f() {
     }
     return f;
-})();
+}());
 f += ''; // error
 f += 1; // error
 f -= 1; // error
diff --git a/tests/baselines/reference/arrayAssignmentTest1.js b/tests/baselines/reference/arrayAssignmentTest1.js
index 70177b4cba26e..e2ca36cbd1de8 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.js
+++ b/tests/baselines/reference/arrayAssignmentTest1.js
@@ -97,7 +97,7 @@ var C1 = (function () {
     C1.prototype.IM1 = function () { return null; };
     C1.prototype.C1M1 = function () { return null; };
     return C1;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
@@ -105,13 +105,13 @@ var C2 = (function (_super) {
     }
     C2.prototype.C2M1 = function () { return null; };
     return C2;
-})(C1);
+}(C1));
 var C3 = (function () {
     function C3() {
     }
     C3.prototype.CM3M1 = function () { return 3; };
     return C3;
-})();
+}());
 /*
 
 This behaves unexpectedly with the following types:
diff --git a/tests/baselines/reference/arrayAssignmentTest2.js b/tests/baselines/reference/arrayAssignmentTest2.js
index 61bddd7e8e409..a15df1b14b7e6 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.js
+++ b/tests/baselines/reference/arrayAssignmentTest2.js
@@ -71,7 +71,7 @@ var C1 = (function () {
     C1.prototype.IM1 = function () { return null; };
     C1.prototype.C1M1 = function () { return null; };
     return C1;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
@@ -79,13 +79,13 @@ var C2 = (function (_super) {
     }
     C2.prototype.C2M1 = function () { return null; };
     return C2;
-})(C1);
+}(C1));
 var C3 = (function () {
     function C3() {
     }
     C3.prototype.CM3M1 = function () { return 3; };
     return C3;
-})();
+}());
 /*
 
 This behaves unexpectedly with the following types:
diff --git a/tests/baselines/reference/arrayAssignmentTest3.js b/tests/baselines/reference/arrayAssignmentTest3.js
index 74cd6662623e7..6e586c738d7af 100644
--- a/tests/baselines/reference/arrayAssignmentTest3.js
+++ b/tests/baselines/reference/arrayAssignmentTest3.js
@@ -22,12 +22,12 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var a = (function () {
     function a(x, y, z) {
         this.x = x;
         this.y = y;
     }
     return a;
-})();
+}());
 var xx = new a(null, 7, new B());
diff --git a/tests/baselines/reference/arrayAssignmentTest4.js b/tests/baselines/reference/arrayAssignmentTest4.js
index c38cdebc06cbe..6cc59bdece44a 100644
--- a/tests/baselines/reference/arrayAssignmentTest4.js
+++ b/tests/baselines/reference/arrayAssignmentTest4.js
@@ -32,7 +32,7 @@ var C3 = (function () {
     }
     C3.prototype.CM3M1 = function () { return 3; };
     return C3;
-})();
+}());
 /*
 
 This behaves unexpectedly with teh following types:
diff --git a/tests/baselines/reference/arrayAssignmentTest5.js b/tests/baselines/reference/arrayAssignmentTest5.js
index a477553678332..f5bd3e882b562 100644
--- a/tests/baselines/reference/arrayAssignmentTest5.js
+++ b/tests/baselines/reference/arrayAssignmentTest5.js
@@ -50,6 +50,6 @@ var Test;
             return null;
         };
         return Bug;
-    })();
+    }());
     Test.Bug = Bug;
 })(Test || (Test = {}));
diff --git a/tests/baselines/reference/arrayAssignmentTest6.js b/tests/baselines/reference/arrayAssignmentTest6.js
index b8ee0c3194688..1e24137ddbaf0 100644
--- a/tests/baselines/reference/arrayAssignmentTest6.js
+++ b/tests/baselines/reference/arrayAssignmentTest6.js
@@ -30,6 +30,6 @@ var Test;
             return null;
         };
         return Bug;
-    })();
+    }());
     Test.Bug = Bug;
 })(Test || (Test = {}));
diff --git a/tests/baselines/reference/arrayBestCommonTypes.js b/tests/baselines/reference/arrayBestCommonTypes.js
index 95dd299ad43d5..f45f67a876545 100644
--- a/tests/baselines/reference/arrayBestCommonTypes.js
+++ b/tests/baselines/reference/arrayBestCommonTypes.js
@@ -119,19 +119,19 @@ var EmptyTypes;
         function base() {
         }
         return base;
-    })();
+    }());
     var base2 = (function () {
         function base2() {
         }
         return base2;
-    })();
+    }());
     var derived = (function (_super) {
         __extends(derived, _super);
         function derived() {
             _super.apply(this, arguments);
         }
         return derived;
-    })(base);
+    }(base));
     var f = (function () {
         function f() {
         }
@@ -170,7 +170,7 @@ var EmptyTypes;
             var b4 = [ifaceObj, baseObj, base2Obj];
         };
         return f;
-    })();
+    }());
 })(EmptyTypes || (EmptyTypes = {}));
 var NonEmptyTypes;
 (function (NonEmptyTypes) {
@@ -178,19 +178,19 @@ var NonEmptyTypes;
         function base() {
         }
         return base;
-    })();
+    }());
     var base2 = (function () {
         function base2() {
         }
         return base2;
-    })();
+    }());
     var derived = (function (_super) {
         __extends(derived, _super);
         function derived() {
             _super.apply(this, arguments);
         }
         return derived;
-    })(base);
+    }(base));
     var f = (function () {
         function f() {
         }
@@ -229,5 +229,5 @@ var NonEmptyTypes;
             var b4 = [ifaceObj, baseObj, base2Obj];
         };
         return f;
-    })();
+    }());
 })(NonEmptyTypes || (NonEmptyTypes = {}));
diff --git a/tests/baselines/reference/arrayLiteralContextualType.js b/tests/baselines/reference/arrayLiteralContextualType.js
index 0edf5c451645b..8d42bc209280d 100644
--- a/tests/baselines/reference/arrayLiteralContextualType.js
+++ b/tests/baselines/reference/arrayLiteralContextualType.js
@@ -36,14 +36,14 @@ var Giraffe = (function () {
         this.neckLength = "3m";
     }
     return Giraffe;
-})();
+}());
 var Elephant = (function () {
     function Elephant() {
         this.name = "Elephant";
         this.trunkDiameter = "20cm";
     }
     return Elephant;
-})();
+}());
 function foo(animals) { }
 function bar(animals) { }
 foo([
diff --git a/tests/baselines/reference/arrayLiteralTypeInference.js b/tests/baselines/reference/arrayLiteralTypeInference.js
index fc573aa390e3f..f54dec83c9c2e 100644
--- a/tests/baselines/reference/arrayLiteralTypeInference.js
+++ b/tests/baselines/reference/arrayLiteralTypeInference.js
@@ -61,21 +61,21 @@ var Action = (function () {
     function Action() {
     }
     return Action;
-})();
+}());
 var ActionA = (function (_super) {
     __extends(ActionA, _super);
     function ActionA() {
         _super.apply(this, arguments);
     }
     return ActionA;
-})(Action);
+}(Action));
 var ActionB = (function (_super) {
     __extends(ActionB, _super);
     function ActionB() {
         _super.apply(this, arguments);
     }
     return ActionB;
-})(Action);
+}(Action));
 var x1 = [
     { id: 2, trueness: false },
     { id: 3, name: "three" }
diff --git a/tests/baselines/reference/arrayLiterals.js b/tests/baselines/reference/arrayLiterals.js
index 0f86b7a7f2a8a..4dbf88f868851 100644
--- a/tests/baselines/reference/arrayLiterals.js
+++ b/tests/baselines/reference/arrayLiterals.js
@@ -54,7 +54,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var classArr = [new C(), new C()];
 var classTypeArray = [C, C, C];
 var classTypeArray; // Should OK, not be a parse error
@@ -66,14 +66,14 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
         _super.apply(this, arguments);
     }
     return Derived1;
-})(Base);
+}(Base));
 ;
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
@@ -81,7 +81,7 @@ var Derived2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 ;
 var context3 = [new Derived1(), new Derived2()];
 // Contextual type C with numeric index signature of type Base makes array literal of Derived1 and Derived2 have type Base[]
diff --git a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
index e303415df0846..c15782a8e2044 100644
--- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
+++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
@@ -35,19 +35,19 @@ var List = (function () {
     function List() {
     }
     return List;
-})();
+}());
 var DerivedList = (function (_super) {
     __extends(DerivedList, _super);
     function DerivedList() {
         _super.apply(this, arguments);
     }
     return DerivedList;
-})(List);
+}(List));
 var MyList = (function () {
     function MyList() {
     }
     return MyList;
-})();
+}());
 var list;
 var list2;
 var myList;
diff --git a/tests/baselines/reference/arrayOfExportedClass.js b/tests/baselines/reference/arrayOfExportedClass.js
index e86a83ee95dd7..f305aacbe65f7 100644
--- a/tests/baselines/reference/arrayOfExportedClass.js
+++ b/tests/baselines/reference/arrayOfExportedClass.js
@@ -30,7 +30,7 @@ var Car = (function () {
     function Car() {
     }
     return Car;
-})();
+}());
 module.exports = Car;
 //// [arrayOfExportedClass_1.js]
 "use strict";
@@ -41,5 +41,5 @@ var Road = (function () {
         this.cars = cars;
     };
     return Road;
-})();
+}());
 module.exports = Road;
diff --git a/tests/baselines/reference/arrayOfFunctionTypes3.js b/tests/baselines/reference/arrayOfFunctionTypes3.js
index c0829418dd754..5a822e67508f2 100644
--- a/tests/baselines/reference/arrayOfFunctionTypes3.js
+++ b/tests/baselines/reference/arrayOfFunctionTypes3.js
@@ -34,7 +34,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var y = [C, C];
 var r3 = new y[0]();
 var a;
diff --git a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js
index 6fcdae657e9b6..3d427bfa9b42d 100644
--- a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js
+++ b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.js
@@ -9,4 +9,4 @@ var X = (function () {
     }
     X.prototype.f = function (a) { };
     return X;
-})();
+}());
diff --git a/tests/baselines/reference/arrayconcat.js b/tests/baselines/reference/arrayconcat.js
index fd527d87c3c53..76250642a599a 100644
--- a/tests/baselines/reference/arrayconcat.js
+++ b/tests/baselines/reference/arrayconcat.js
@@ -48,4 +48,4 @@ var parser = (function () {
         });
     };
     return parser;
-})();
+}());
diff --git a/tests/baselines/reference/arrowFunctionContexts.js b/tests/baselines/reference/arrowFunctionContexts.js
index 5d862dcec8cc1..7b424107bd149 100644
--- a/tests/baselines/reference/arrowFunctionContexts.js
+++ b/tests/baselines/reference/arrowFunctionContexts.js
@@ -111,7 +111,7 @@ var Base = (function () {
     function Base(n) {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -119,7 +119,7 @@ var Derived = (function (_super) {
         _super.call(this, function () { return _this; });
     }
     return Derived;
-})(Base);
+}(Base));
 // Arrow function as function argument
 window.setTimeout(function () { return null; }, 100);
 // Arrow function as value in array literal
@@ -151,7 +151,7 @@ var M2;
         function Base(n) {
         }
         return Base;
-    })();
+    }());
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
@@ -159,7 +159,7 @@ var M2;
             _super.call(this, function () { return _this; });
         }
         return Derived;
-    })(Base);
+    }(Base));
     // Arrow function as function argument
     window.setTimeout(function () { return null; }, 100);
     // Arrow function as value in array literal
diff --git a/tests/baselines/reference/arrowFunctionExpressions.js b/tests/baselines/reference/arrowFunctionExpressions.js
index 5e365291da793..66f53d32dba9a 100644
--- a/tests/baselines/reference/arrowFunctionExpressions.js
+++ b/tests/baselines/reference/arrowFunctionExpressions.js
@@ -156,7 +156,7 @@ var MyClass = (function () {
         var p = function (n) { return n && _this; };
     };
     return MyClass;
-})();
+}());
 // Arrow function used in arrow function
 var arrrr = function () { return function (m) { return function () { return function (n) { return m + n; }; }; }; };
 var e = arrrr()(3)()(4);
diff --git a/tests/baselines/reference/arrowFunctionInConstructorArgument1.js b/tests/baselines/reference/arrowFunctionInConstructorArgument1.js
index 0f9c3f81b3b50..9d1c8f9d99558 100644
--- a/tests/baselines/reference/arrowFunctionInConstructorArgument1.js
+++ b/tests/baselines/reference/arrowFunctionInConstructorArgument1.js
@@ -10,5 +10,5 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
 var c = new C(function () { return asdf; }); // should error
diff --git a/tests/baselines/reference/asOperatorASI.js b/tests/baselines/reference/asOperatorASI.js
index 1df39b36e50f5..10b6f90f714af 100644
--- a/tests/baselines/reference/asOperatorASI.js
+++ b/tests/baselines/reference/asOperatorASI.js
@@ -16,7 +16,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 // Example 1
 var x = 10;
 (_a = ["Hello world"], _a.raw = ["Hello world"], as(_a)); // should not error
diff --git a/tests/baselines/reference/asiAbstract.js b/tests/baselines/reference/asiAbstract.js
index 8d5b412d022b5..c17e1911e4ed9 100644
--- a/tests/baselines/reference/asiAbstract.js
+++ b/tests/baselines/reference/asiAbstract.js
@@ -21,16 +21,16 @@ var NonAbstractClass = (function () {
     function NonAbstractClass() {
     }
     return NonAbstractClass;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     C2.prototype.nonAbstractFunction = function () {
     };
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
diff --git a/tests/baselines/reference/asiInES6Classes.js b/tests/baselines/reference/asiInES6Classes.js
index df4b0288d8a80..d315809d25676 100644
--- a/tests/baselines/reference/asiInES6Classes.js
+++ b/tests/baselines/reference/asiInES6Classes.js
@@ -33,4 +33,4 @@ var Foo = (function () {
         return 3;
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/asiPublicPrivateProtected.js b/tests/baselines/reference/asiPublicPrivateProtected.js
index a17bcb7509a8b..12faef5316b6c 100644
--- a/tests/baselines/reference/asiPublicPrivateProtected.js
+++ b/tests/baselines/reference/asiPublicPrivateProtected.js
@@ -48,14 +48,14 @@ var NonPublicClass = (function () {
     NonPublicClass.prototype.s = function () {
     };
     return NonPublicClass;
-})();
+}());
 var NonPublicClass2 = (function () {
     function NonPublicClass2() {
     }
     NonPublicClass2.prototype.nonPublicFunction = function () {
     };
     return NonPublicClass2;
-})();
+}());
 private;
 var NonPrivateClass = (function () {
     function NonPrivateClass() {
@@ -63,14 +63,14 @@ var NonPrivateClass = (function () {
     NonPrivateClass.prototype.s = function () {
     };
     return NonPrivateClass;
-})();
+}());
 var NonPrivateClass2 = (function () {
     function NonPrivateClass2() {
     }
     NonPrivateClass2.prototype.nonPrivateFunction = function () {
     };
     return NonPrivateClass2;
-})();
+}());
 protected;
 var NonProtectedClass = (function () {
     function NonProtectedClass() {
@@ -78,16 +78,16 @@ var NonProtectedClass = (function () {
     NonProtectedClass.prototype.s = function () {
     };
     return NonProtectedClass;
-})();
+}());
 var NonProtectedClass2 = (function () {
     function NonProtectedClass2() {
     }
     NonProtectedClass2.prototype.nonProtectedFunction = function () {
     };
     return NonProtectedClass2;
-})();
+}());
 var ClassWithThreeMembers = (function () {
     function ClassWithThreeMembers() {
     }
     return ClassWithThreeMembers;
-})();
+}());
diff --git a/tests/baselines/reference/assertInWrapSomeTypeParameter.js b/tests/baselines/reference/assertInWrapSomeTypeParameter.js
index efb7d31a86ac7..698ba439ab72f 100644
--- a/tests/baselines/reference/assertInWrapSomeTypeParameter.js
+++ b/tests/baselines/reference/assertInWrapSomeTypeParameter.js
@@ -13,4 +13,4 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/assignAnyToEveryType.js b/tests/baselines/reference/assignAnyToEveryType.js
index 94b8067ddd786..3feade2c911c8 100644
--- a/tests/baselines/reference/assignAnyToEveryType.js
+++ b/tests/baselines/reference/assignAnyToEveryType.js
@@ -67,7 +67,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var h = x;
 var i = x;
 var j = x;
diff --git a/tests/baselines/reference/assignEveryTypeToAny.js b/tests/baselines/reference/assignEveryTypeToAny.js
index bbe622b33005c..408d7992913a1 100644
--- a/tests/baselines/reference/assignEveryTypeToAny.js
+++ b/tests/baselines/reference/assignEveryTypeToAny.js
@@ -86,7 +86,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var h;
 x = h;
 var i;
diff --git a/tests/baselines/reference/assignToExistingClass.js b/tests/baselines/reference/assignToExistingClass.js
index f12979f314273..3e21479186ded 100644
--- a/tests/baselines/reference/assignToExistingClass.js
+++ b/tests/baselines/reference/assignToExistingClass.js
@@ -22,7 +22,7 @@ var Test;
         function Mocked() {
         }
         return Mocked;
-    })();
+    }());
     var Tester = (function () {
         function Tester() {
         }
@@ -32,5 +32,5 @@ var Test;
             };
         };
         return Tester;
-    })();
+    }());
 })(Test || (Test = {}));
diff --git a/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.js b/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.js
index 487591bc81ed5..48bb9f1131af2 100644
--- a/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.js
+++ b/tests/baselines/reference/assignToObjectTypeWithPrototypeProperty.js
@@ -8,6 +8,6 @@ var XEvent = (function () {
     function XEvent() {
     }
     return XEvent;
-})();
+}());
 var p = XEvent.prototype;
 var x = XEvent;
diff --git a/tests/baselines/reference/assignmentCompatBug3.js b/tests/baselines/reference/assignmentCompatBug3.js
index 049e70903350b..a72ea1d439ec9 100644
--- a/tests/baselines/reference/assignmentCompatBug3.js
+++ b/tests/baselines/reference/assignmentCompatBug3.js
@@ -48,7 +48,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 function foo(test) { }
 var x;
 var y;
diff --git a/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js b/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js
index bb6817bb60e98..68d14d9f0c81d 100644
--- a/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js
+++ b/tests/baselines/reference/assignmentCompatInterfaceWithStringIndexSignature.js
@@ -22,6 +22,6 @@ var Foo = (function () {
     }
     Foo.prototype.Boz = function () { };
     return Foo;
-})();
+}());
 function Biz(map) { }
 Biz(new Foo());
diff --git a/tests/baselines/reference/assignmentCompatOnNew.js b/tests/baselines/reference/assignmentCompatOnNew.js
index 1b8cfdcc3bf87..6b553fef44602 100644
--- a/tests/baselines/reference/assignmentCompatOnNew.js
+++ b/tests/baselines/reference/assignmentCompatOnNew.js
@@ -11,7 +11,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 ;
 function bar(x) { }
 bar(Foo); // Error, but should be allowed
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
index 6f2eaf4d5cc1c..24f95ec61eaee 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
@@ -110,28 +110,28 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
 var a;
 var a2;
 var a3;
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
index fc6ca05ad30a8..43608565039b2 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
@@ -111,28 +111,28 @@ var Errors;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
             _super.apply(this, arguments);
         }
         return Derived;
-    })(Base);
+    }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
             _super.apply(this, arguments);
         }
         return Derived2;
-    })(Derived);
+    }(Derived));
     var OtherDerived = (function (_super) {
         __extends(OtherDerived, _super);
         function OtherDerived() {
             _super.apply(this, arguments);
         }
         return OtherDerived;
-    })(Base);
+    }(Base));
     var WithNonGenericSignaturesInBaseType;
     (function (WithNonGenericSignaturesInBaseType) {
         // target type with non-generic call signatures
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
index ddf16c23f4861..b3318dd53e814 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
@@ -76,28 +76,28 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
 var a;
 var a2;
 var a3;
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
index e57a5ac07a0f0..becbfea57a037 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
@@ -53,28 +53,28 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
 var x;
 var b;
 x.a = b;
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
index d02c635c5847f..d062a563a4dd3 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
@@ -110,28 +110,28 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
 var a;
 var a2;
 var a3;
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
index 6f9f20333f2c2..5744424f8786c 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
@@ -111,28 +111,28 @@ var Errors;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
             _super.apply(this, arguments);
         }
         return Derived;
-    })(Base);
+    }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
             _super.apply(this, arguments);
         }
         return Derived2;
-    })(Derived);
+    }(Derived));
     var OtherDerived = (function (_super) {
         __extends(OtherDerived, _super);
         function OtherDerived() {
             _super.apply(this, arguments);
         }
         return OtherDerived;
-    })(Base);
+    }(Base));
     var WithNonGenericSignaturesInBaseType;
     (function (WithNonGenericSignaturesInBaseType) {
         // target type with non-generic call signatures
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
index bd4c73e65ddaa..de42671c9f1f6 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
@@ -76,28 +76,28 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
 var a;
 var a2;
 var a3;
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
index 98477fa1523a4..206ae7768baf6 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
@@ -53,28 +53,28 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
 var x;
 var b;
 x.a = b;
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js
index f5a3499c8cc0e..87977de1ab9f4 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignaturesWithOptionalParameters.js
@@ -159,7 +159,7 @@ var ClassTypeParam;
             };
         }
         return Base;
-    })();
+    }());
 })(ClassTypeParam || (ClassTypeParam = {}));
 var GenericSignaturesInvalid;
 (function (GenericSignaturesInvalid) {
@@ -167,12 +167,12 @@ var GenericSignaturesInvalid;
         function Base2() {
         }
         return Base2;
-    })();
+    }());
     var Target = (function () {
         function Target() {
         }
         return Target;
-    })();
+    }());
     function foo() {
         var b;
         var t;
@@ -231,5 +231,5 @@ var GenericSignaturesValid;
             };
         }
         return Base2;
-    })();
+    }());
 })(GenericSignaturesValid || (GenericSignaturesValid = {}));
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
index 617d136bbb2cf..56b206786f1e2 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
@@ -54,7 +54,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var a;
 var b;
 a = b;
@@ -68,14 +68,14 @@ var Generics;
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     function foo() {
         var a;
         var b;
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
index 0c5b0be038f99..53f92dd3b592b 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
@@ -51,7 +51,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var a;
 var b;
 a = b; // error
@@ -62,7 +62,7 @@ var B2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return B2;
-})(A);
+}(A));
 var b2;
 a = b2; // ok
 b2 = a; // error
@@ -72,7 +72,7 @@ var Generics;
         function A() {
         }
         return A;
-    })();
+    }());
     function foo() {
         var a;
         var b;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.js b/tests/baselines/reference/assignmentCompatWithObjectMembers.js
index 3bd457f19d3ed..2bef0f9f5c4bd 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.js
@@ -94,12 +94,12 @@ var SimpleTypes;
         function S() {
         }
         return S;
-    })();
+    }());
     var T = (function () {
         function T() {
         }
         return T;
-    })();
+    }());
     var s;
     var t;
     var s2;
@@ -134,12 +134,12 @@ var ObjectTypes;
         function S() {
         }
         return S;
-    })();
+    }());
     var T = (function () {
         function T() {
         }
         return T;
-    })();
+    }());
     var s;
     var t;
     var s2;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers2.js b/tests/baselines/reference/assignmentCompatWithObjectMembers2.js
index ea565e9545c3c..d1eda3808fee8 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers2.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers2.js
@@ -49,12 +49,12 @@ var S = (function () {
     function S() {
     }
     return S;
-})();
+}());
 var T = (function () {
     function T() {
     }
     return T;
-})();
+}());
 var s;
 var t;
 var s2;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers3.js b/tests/baselines/reference/assignmentCompatWithObjectMembers3.js
index 091a1e53d1501..82b72c84485a7 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers3.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers3.js
@@ -49,12 +49,12 @@ var S = (function () {
     function S() {
     }
     return S;
-})();
+}());
 var T = (function () {
     function T() {
     }
     return T;
-})();
+}());
 var s;
 var t;
 var s2;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
index 20279fb1dc564..092de2ca7073b 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
@@ -104,31 +104,31 @@ var OnlyDerived;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
             _super.apply(this, arguments);
         }
         return Derived;
-    })(Base);
+    }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
             _super.apply(this, arguments);
         }
         return Derived2;
-    })(Base);
+    }(Base));
     var S = (function () {
         function S() {
         }
         return S;
-    })();
+    }());
     var T = (function () {
         function T() {
         }
         return T;
-    })();
+    }());
     var s;
     var t;
     var s2;
@@ -163,31 +163,31 @@ var WithBase;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
             _super.apply(this, arguments);
         }
         return Derived;
-    })(Base);
+    }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
             _super.apply(this, arguments);
         }
         return Derived2;
-    })(Base);
+    }(Base));
     var S = (function () {
         function S() {
         }
         return S;
-    })();
+    }());
     var T = (function () {
         function T() {
         }
         return T;
-    })();
+    }());
     var s;
     var t;
     var s2;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers5.js b/tests/baselines/reference/assignmentCompatWithObjectMembers5.js
index d755629841481..9ed799abdb2c9 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers5.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers5.js
@@ -19,7 +19,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var i;
 c = i; // error
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js
index 3363ed7089032..e876ba575bece 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersAccessibility.js
@@ -118,7 +118,7 @@ var TargetIsPublic;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var a;
     var b;
     var i;
@@ -127,12 +127,12 @@ var TargetIsPublic;
         function D() {
         }
         return D;
-    })();
+    }());
     var E = (function () {
         function E() {
         }
         return E;
-    })();
+    }());
     var d;
     var e;
     a = b;
@@ -164,7 +164,7 @@ var TargetIsPublic;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var a;
     var b;
     var i;
@@ -173,12 +173,12 @@ var TargetIsPublic;
         function D() {
         }
         return D;
-    })();
+    }());
     var E = (function () {
         function E() {
         }
         return E;
-    })();
+    }());
     var d;
     var e;
     a = b; // error
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js
index 2a1a08a97ed2d..92f088c2f101e 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersNumericNames.js
@@ -49,12 +49,12 @@ var S = (function () {
     function S() {
     }
     return S;
-})();
+}());
 var T = (function () {
     function T() {
     }
     return T;
-})();
+}());
 var s;
 var t;
 var s2;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
index 6675fab6d6915..791ae494ab21d 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
@@ -99,21 +99,21 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var TargetHasOptional;
 (function (TargetHasOptional) {
     var c;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
index b89106eba2bcb..d93ddf8b3a4b5 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
@@ -101,21 +101,21 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var TargetHasOptional;
 (function (TargetHasOptional) {
     var c;
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js
index a042897ba57db..80d0ac84de712 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersStringNumericNames.js
@@ -94,12 +94,12 @@ var JustStrings;
         function S() {
         }
         return S;
-    })();
+    }());
     var T = (function () {
         function T() {
         }
         return T;
-    })();
+    }());
     var s;
     var t;
     var s2;
@@ -134,12 +134,12 @@ var NumbersAndStrings;
         function S() {
         }
         return S;
-    })();
+    }());
     var T = (function () {
         function T() {
         }
         return T;
-    })();
+    }());
     var s;
     var t;
     var s2;
diff --git a/tests/baselines/reference/assignmentCompatWithOverloads.js b/tests/baselines/reference/assignmentCompatWithOverloads.js
index ca3dc0e2294f9..68dd818e4a875 100644
--- a/tests/baselines/reference/assignmentCompatWithOverloads.js
+++ b/tests/baselines/reference/assignmentCompatWithOverloads.js
@@ -44,6 +44,6 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
 var d;
 d = C; // Error
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.js b/tests/baselines/reference/assignmentCompatWithStringIndexer.js
index 3391ac5773a95..ef6befe268eb7 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.js
@@ -64,7 +64,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var a;
 var b;
 a = b; // ok
@@ -78,14 +78,14 @@ var Generics;
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     var b1;
     var a1;
     a1 = b1; // ok
@@ -96,7 +96,7 @@ var Generics;
             _super.apply(this, arguments);
         }
         return B2;
-    })(A);
+    }(A));
     var b2;
     a1 = b2; // ok
     b2 = a1; // error
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer3.js b/tests/baselines/reference/assignmentCompatWithStringIndexer3.js
index 15263428884bb..f0a3439f25f7c 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer3.js
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer3.js
@@ -35,7 +35,7 @@ var Generics;
         function A() {
         }
         return A;
-    })();
+    }());
     function foo() {
         var a;
         var b;
diff --git a/tests/baselines/reference/assignmentCompatability10.js b/tests/baselines/reference/assignmentCompatability10.js
index bbcc8e879e3bb..bde7af81e2c14 100644
--- a/tests/baselines/reference/assignmentCompatability10.js
+++ b/tests/baselines/reference/assignmentCompatability10.js
@@ -25,7 +25,7 @@ var __test2__;
             this.two = two;
         }
         return classWithPublicAndOptional;
-    })();
+    }());
     __test2__.classWithPublicAndOptional = classWithPublicAndOptional;
     var x4 = new classWithPublicAndOptional(1);
     ;
diff --git a/tests/baselines/reference/assignmentCompatability39.js b/tests/baselines/reference/assignmentCompatability39.js
index 70e8a69229002..3dfdbee632d96 100644
--- a/tests/baselines/reference/assignmentCompatability39.js
+++ b/tests/baselines/reference/assignmentCompatability39.js
@@ -25,7 +25,7 @@ var __test2__;
             this.two = two;
         }
         return classWithTwoPublic;
-    })();
+    }());
     __test2__.classWithTwoPublic = classWithTwoPublic;
     var x2 = new classWithTwoPublic(1, "a");
     ;
diff --git a/tests/baselines/reference/assignmentCompatability40.js b/tests/baselines/reference/assignmentCompatability40.js
index 801ddfe75964f..c7e671dfdd3cb 100644
--- a/tests/baselines/reference/assignmentCompatability40.js
+++ b/tests/baselines/reference/assignmentCompatability40.js
@@ -24,7 +24,7 @@ var __test2__;
             this.one = one;
         }
         return classWithPrivate;
-    })();
+    }());
     __test2__.classWithPrivate = classWithPrivate;
     var x5 = new classWithPrivate(1);
     ;
diff --git a/tests/baselines/reference/assignmentCompatability41.js b/tests/baselines/reference/assignmentCompatability41.js
index 2ebd35a6caab2..21b36ce92f122 100644
--- a/tests/baselines/reference/assignmentCompatability41.js
+++ b/tests/baselines/reference/assignmentCompatability41.js
@@ -25,7 +25,7 @@ var __test2__;
             this.two = two;
         }
         return classWithTwoPrivate;
-    })();
+    }());
     __test2__.classWithTwoPrivate = classWithTwoPrivate;
     var x6 = new classWithTwoPrivate(1, "a");
     ;
diff --git a/tests/baselines/reference/assignmentCompatability42.js b/tests/baselines/reference/assignmentCompatability42.js
index 39dab170d35c9..c6baff4617070 100644
--- a/tests/baselines/reference/assignmentCompatability42.js
+++ b/tests/baselines/reference/assignmentCompatability42.js
@@ -25,7 +25,7 @@ var __test2__;
             this.two = two;
         }
         return classWithPublicPrivate;
-    })();
+    }());
     __test2__.classWithPublicPrivate = classWithPublicPrivate;
     var x7 = new classWithPublicPrivate(1, "a");
     ;
diff --git a/tests/baselines/reference/assignmentCompatability8.js b/tests/baselines/reference/assignmentCompatability8.js
index 65e4240aac553..38459e41cfa08 100644
--- a/tests/baselines/reference/assignmentCompatability8.js
+++ b/tests/baselines/reference/assignmentCompatability8.js
@@ -24,7 +24,7 @@ var __test2__;
             this.one = one;
         }
         return classWithPublic;
-    })();
+    }());
     __test2__.classWithPublic = classWithPublic;
     var x1 = new classWithPublic(1);
     ;
diff --git a/tests/baselines/reference/assignmentCompatability9.js b/tests/baselines/reference/assignmentCompatability9.js
index 98932380b3ecb..051155ad1ddc8 100644
--- a/tests/baselines/reference/assignmentCompatability9.js
+++ b/tests/baselines/reference/assignmentCompatability9.js
@@ -24,7 +24,7 @@ var __test2__;
             this.one = one;
         }
         return classWithOptional;
-    })();
+    }());
     __test2__.classWithOptional = classWithOptional;
     var x3 = new classWithOptional();
     ;
diff --git a/tests/baselines/reference/assignmentLHSIsValue.js b/tests/baselines/reference/assignmentLHSIsValue.js
index 127f85512aca9..8a3b4b35d0b87 100644
--- a/tests/baselines/reference/assignmentLHSIsValue.js
+++ b/tests/baselines/reference/assignmentLHSIsValue.js
@@ -86,7 +86,7 @@ var C = (function () {
     C.prototype.foo = function () { this = value; };
     C.sfoo = function () { this = value; };
     return C;
-})();
+}());
 function foo() { this = value; }
 this = value;
 // identifiers: module, class, enum, function
@@ -124,7 +124,7 @@ var Derived = (function (_super) {
     Derived.prototype.foo = function () { _super.prototype. = value; };
     Derived.sfoo = function () { _super. = value; };
     return Derived;
-})(C);
+}(C));
 // function expression
 function bar() { }
 value;
diff --git a/tests/baselines/reference/assignmentNonObjectTypeConstraints.js b/tests/baselines/reference/assignmentNonObjectTypeConstraints.js
index c9d3cec38f6a4..7bce8d5443eaf 100644
--- a/tests/baselines/reference/assignmentNonObjectTypeConstraints.js
+++ b/tests/baselines/reference/assignmentNonObjectTypeConstraints.js
@@ -29,12 +29,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 function bar(x) {
     var y = x; // Ok
 }
diff --git a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js
index d28dd76fcf692..67d0c25f45ff3 100644
--- a/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js
+++ b/tests/baselines/reference/assignmentToParenthesizedIdentifiers.js
@@ -130,6 +130,6 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 C = undefined; // Error
 (C) = undefined; // Error
diff --git a/tests/baselines/reference/assignmentToReferenceTypes.js b/tests/baselines/reference/assignmentToReferenceTypes.js
index 1aec3c2051dd8..e201b0bacabc9 100644
--- a/tests/baselines/reference/assignmentToReferenceTypes.js
+++ b/tests/baselines/reference/assignmentToReferenceTypes.js
@@ -30,7 +30,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 C = null;
 var E;
 (function (E) {
diff --git a/tests/baselines/reference/assignments.js b/tests/baselines/reference/assignments.js
index e2c9c90d3757a..739c8bd279567 100644
--- a/tests/baselines/reference/assignments.js
+++ b/tests/baselines/reference/assignments.js
@@ -45,7 +45,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 C = null; // Error
 var E;
 (function (E) {
diff --git a/tests/baselines/reference/augmentedTypesClass.js b/tests/baselines/reference/augmentedTypesClass.js
index 30b75483d80e2..48cc4ef05de27 100644
--- a/tests/baselines/reference/augmentedTypesClass.js
+++ b/tests/baselines/reference/augmentedTypesClass.js
@@ -14,7 +14,7 @@ var c1 = (function () {
     }
     c1.prototype.foo = function () { };
     return c1;
-})();
+}());
 var c1 = 1; // error
 //// class then enum
 var c4 = (function () {
@@ -22,7 +22,7 @@ var c4 = (function () {
     }
     c4.prototype.foo = function () { };
     return c4;
-})();
+}());
 var c4;
 (function (c4) {
     c4[c4["One"] = 0] = "One";
diff --git a/tests/baselines/reference/augmentedTypesClass2.js b/tests/baselines/reference/augmentedTypesClass2.js
index 4a919913ce0fa..ee87a2396ad93 100644
--- a/tests/baselines/reference/augmentedTypesClass2.js
+++ b/tests/baselines/reference/augmentedTypesClass2.js
@@ -40,7 +40,7 @@ var c11 = (function () {
         return 1;
     };
     return c11;
-})();
+}());
 // class then class - covered
 // class then enum 
 var c33 = (function () {
@@ -50,7 +50,7 @@ var c33 = (function () {
         return 1;
     };
     return c33;
-})();
+}());
 var c33;
 (function (c33) {
     c33[c33["One"] = 0] = "One";
@@ -64,4 +64,4 @@ var c44 = (function () {
         return 1;
     };
     return c44;
-})();
+}());
diff --git a/tests/baselines/reference/augmentedTypesClass2a.js b/tests/baselines/reference/augmentedTypesClass2a.js
index b2c6fa1e37375..ba1f26c775d0a 100644
--- a/tests/baselines/reference/augmentedTypesClass2a.js
+++ b/tests/baselines/reference/augmentedTypesClass2a.js
@@ -11,6 +11,6 @@ var c2 = (function () {
     }
     c2.prototype.foo = function () { };
     return c2;
-})(); // error
+}()); // error
 function c2() { } // error
 var c2 = function () { };
diff --git a/tests/baselines/reference/augmentedTypesClass3.js b/tests/baselines/reference/augmentedTypesClass3.js
index 11d3f0a0d9fd3..216cd118ee682 100644
--- a/tests/baselines/reference/augmentedTypesClass3.js
+++ b/tests/baselines/reference/augmentedTypesClass3.js
@@ -20,13 +20,13 @@ var c5 = (function () {
     }
     c5.prototype.foo = function () { };
     return c5;
-})();
+}());
 var c5a = (function () {
     function c5a() {
     }
     c5a.prototype.foo = function () { };
     return c5a;
-})();
+}());
 var c5a;
 (function (c5a) {
     var y = 2;
@@ -36,7 +36,7 @@ var c5b = (function () {
     }
     c5b.prototype.foo = function () { };
     return c5b;
-})();
+}());
 var c5b;
 (function (c5b) {
     c5b.y = 2;
@@ -47,5 +47,5 @@ var c5c = (function () {
     }
     c5c.prototype.foo = function () { };
     return c5c;
-})();
+}());
 //import c5c = require(''); 
diff --git a/tests/baselines/reference/augmentedTypesClass4.js b/tests/baselines/reference/augmentedTypesClass4.js
index f178567d843df..e476beadf74d8 100644
--- a/tests/baselines/reference/augmentedTypesClass4.js
+++ b/tests/baselines/reference/augmentedTypesClass4.js
@@ -11,10 +11,10 @@ var c3 = (function () {
     }
     c3.prototype.foo = function () { };
     return c3;
-})(); // error
+}()); // error
 var c3 = (function () {
     function c3() {
     }
     c3.prototype.bar = function () { };
     return c3;
-})(); // error
+}()); // error
diff --git a/tests/baselines/reference/augmentedTypesEnum.js b/tests/baselines/reference/augmentedTypesEnum.js
index cb1ec3e844fc8..3d2bb0b7d2531 100644
--- a/tests/baselines/reference/augmentedTypesEnum.js
+++ b/tests/baselines/reference/augmentedTypesEnum.js
@@ -63,7 +63,7 @@ var e4 = (function () {
     }
     e4.prototype.foo = function () { };
     return e4;
-})(); // error
+}()); // error
 // enum then enum
 var e5;
 (function (e5) {
diff --git a/tests/baselines/reference/augmentedTypesEnum2.js b/tests/baselines/reference/augmentedTypesEnum2.js
index f0c86e5640b8a..be174423d1da3 100644
--- a/tests/baselines/reference/augmentedTypesEnum2.js
+++ b/tests/baselines/reference/augmentedTypesEnum2.js
@@ -39,6 +39,6 @@ var e2 = (function () {
         return 1;
     };
     return e2;
-})();
+}());
 //enum then enum - covered
 //enum then import - covered 
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js
index 7965aa671ae1d..65525e8187eea 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.js
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.js
@@ -12,5 +12,5 @@ define(["require", "exports"], function (require, exports) {
         }
         c5.prototype.foo = function () { };
         return c5;
-    })();
+    }());
 });
diff --git a/tests/baselines/reference/augmentedTypesFunction.js b/tests/baselines/reference/augmentedTypesFunction.js
index 1cd1423b7c4c3..72f36aeeccc3a 100644
--- a/tests/baselines/reference/augmentedTypesFunction.js
+++ b/tests/baselines/reference/augmentedTypesFunction.js
@@ -53,14 +53,14 @@ var y3 = (function () {
     function y3() {
     }
     return y3;
-})(); // error
+}()); // error
 function y3a() { } // error
 var y3a = (function () {
     function y3a() {
     }
     y3a.prototype.foo = function () { };
     return y3a;
-})(); // error
+}()); // error
 // function then enum
 function y4() { } // error
 var y4;
diff --git a/tests/baselines/reference/augmentedTypesInterface.js b/tests/baselines/reference/augmentedTypesInterface.js
index 330fc035a9e96..fb8608aca956a 100644
--- a/tests/baselines/reference/augmentedTypesInterface.js
+++ b/tests/baselines/reference/augmentedTypesInterface.js
@@ -42,7 +42,7 @@ var i2 = (function () {
         return 1;
     };
     return i2;
-})();
+}());
 var i3;
 (function (i3) {
     i3[i3["One"] = 0] = "One";
diff --git a/tests/baselines/reference/augmentedTypesModules.js b/tests/baselines/reference/augmentedTypesModules.js
index 558ea6609f56e..39a4c17454bbd 100644
--- a/tests/baselines/reference/augmentedTypesModules.js
+++ b/tests/baselines/reference/augmentedTypesModules.js
@@ -117,7 +117,7 @@ var m1d;
         }
         I.prototype.foo = function () { };
         return I;
-    })();
+    }());
     m1d.I = I;
 })(m1d || (m1d = {}));
 var m1d = 1; // error
@@ -153,14 +153,14 @@ var m2g;
         }
         C.prototype.foo = function () { };
         return C;
-    })();
+    }());
     m2g.C = C;
 })(m2g || (m2g = {}));
 var m3 = (function () {
     function m3() {
     }
     return m3;
-})(); // ok since the module is not instantiated
+}()); // ok since the module is not instantiated
 var m3a;
 (function (m3a) {
     var y = 2;
@@ -170,13 +170,13 @@ var m3a = (function () {
     }
     m3a.prototype.foo = function () { };
     return m3a;
-})(); // error, class isn't ambient or declared before the module
+}()); // error, class isn't ambient or declared before the module
 var m3b = (function () {
     function m3b() {
     }
     m3b.prototype.foo = function () { };
     return m3b;
-})();
+}());
 var m3b;
 (function (m3b) {
     var y = 2;
@@ -186,7 +186,7 @@ var m3c = (function () {
     }
     m3c.prototype.foo = function () { };
     return m3c;
-})();
+}());
 var m3c;
 (function (m3c) {
     m3c.y = 2;
@@ -206,7 +206,7 @@ var m3g;
         }
         C.prototype.foo = function () { };
         return C;
-    })();
+    }());
     m3g.C = C;
 })(m3g || (m3g = {}));
 var m4;
@@ -239,7 +239,7 @@ var m4d;
         }
         C.prototype.foo = function () { };
         return C;
-    })();
+    }());
 })(m4d || (m4d = {}));
 var m4d;
 (function (m4d) {
diff --git a/tests/baselines/reference/augmentedTypesModules2.js b/tests/baselines/reference/augmentedTypesModules2.js
index 5cc805a848f00..82bba357bba5f 100644
--- a/tests/baselines/reference/augmentedTypesModules2.js
+++ b/tests/baselines/reference/augmentedTypesModules2.js
@@ -66,6 +66,6 @@ var m2g;
         }
         C.prototype.foo = function () { };
         return C;
-    })();
+    }());
     m2g.C = C;
 })(m2g || (m2g = {}));
diff --git a/tests/baselines/reference/augmentedTypesModules3.js b/tests/baselines/reference/augmentedTypesModules3.js
index fb1c7ef6e70c2..cb63acd0d3532 100644
--- a/tests/baselines/reference/augmentedTypesModules3.js
+++ b/tests/baselines/reference/augmentedTypesModules3.js
@@ -11,7 +11,7 @@ var m3 = (function () {
     function m3() {
     }
     return m3;
-})(); // ok since the module is not instantiated
+}()); // ok since the module is not instantiated
 var m3a;
 (function (m3a) {
     var y = 2;
@@ -21,4 +21,4 @@ var m3a = (function () {
     }
     m3a.prototype.foo = function () { };
     return m3a;
-})(); // error, class isn't ambient or declared before the module
+}()); // error, class isn't ambient or declared before the module
diff --git a/tests/baselines/reference/augmentedTypesModules3b.js b/tests/baselines/reference/augmentedTypesModules3b.js
index 080a5e72adabf..a422ad7997391 100644
--- a/tests/baselines/reference/augmentedTypesModules3b.js
+++ b/tests/baselines/reference/augmentedTypesModules3b.js
@@ -24,7 +24,7 @@ var m3b = (function () {
     }
     m3b.prototype.foo = function () { };
     return m3b;
-})();
+}());
 var m3b;
 (function (m3b) {
     var y = 2;
@@ -34,7 +34,7 @@ var m3c = (function () {
     }
     m3c.prototype.foo = function () { };
     return m3c;
-})();
+}());
 var m3c;
 (function (m3c) {
     m3c.y = 2;
@@ -54,6 +54,6 @@ var m3g;
         }
         C.prototype.foo = function () { };
         return C;
-    })();
+    }());
     m3g.C = C;
 })(m3g || (m3g = {}));
diff --git a/tests/baselines/reference/augmentedTypesModules4.js b/tests/baselines/reference/augmentedTypesModules4.js
index 82f08851efd55..ed86c057462f7 100644
--- a/tests/baselines/reference/augmentedTypesModules4.js
+++ b/tests/baselines/reference/augmentedTypesModules4.js
@@ -53,7 +53,7 @@ var m4d;
         }
         C.prototype.foo = function () { };
         return C;
-    })();
+    }());
 })(m4d || (m4d = {}));
 var m4d;
 (function (m4d) {
diff --git a/tests/baselines/reference/augmentedTypesVar.js b/tests/baselines/reference/augmentedTypesVar.js
index b4e412acc0568..f01cfa2e52fa5 100644
--- a/tests/baselines/reference/augmentedTypesVar.js
+++ b/tests/baselines/reference/augmentedTypesVar.js
@@ -51,14 +51,14 @@ var x4 = (function () {
     function x4() {
     }
     return x4;
-})(); // error
+}()); // error
 var x4a = 1; // error
 var x4a = (function () {
     function x4a() {
     }
     x4a.prototype.foo = function () { };
     return x4a;
-})(); // error
+}()); // error
 // var then enum
 var x5 = 1;
 var x5;
diff --git a/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js b/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js
index 27b56e4ff88d4..5c64b8fc23f48 100644
--- a/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js
+++ b/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/autoLift2.js b/tests/baselines/reference/autoLift2.js
index cf840277d70cd..ab2d2107f6ce7 100644
--- a/tests/baselines/reference/autoLift2.js
+++ b/tests/baselines/reference/autoLift2.js
@@ -47,6 +47,6 @@ var A = (function () {
         [1, 2].forEach(function (p) { return _this.bar; });
     };
     return A;
-})();
+}());
 var a = new A();
 a.baz();
diff --git a/tests/baselines/reference/autolift3.js b/tests/baselines/reference/autolift3.js
index e04501daf461c..21be70763fe22 100644
--- a/tests/baselines/reference/autolift3.js
+++ b/tests/baselines/reference/autolift3.js
@@ -49,6 +49,6 @@ var B = (function () {
         })();
     }
     return B;
-})();
+}());
 var b = new B();
 b.foo();
diff --git a/tests/baselines/reference/autolift4.js b/tests/baselines/reference/autolift4.js
index f4bbad50c6096..8ee1f397d438d 100644
--- a/tests/baselines/reference/autolift4.js
+++ b/tests/baselines/reference/autolift4.js
@@ -39,7 +39,7 @@ var Point = (function () {
     };
     Point.origin = new Point(0, 0);
     return Point;
-})();
+}());
 var Point3D = (function (_super) {
     __extends(Point3D, _super);
     function Point3D(x, y, z, m) {
@@ -50,4 +50,4 @@ var Point3D = (function (_super) {
         return Math.sqrt(this.x * this.x + this.y * this.y + this.z * this.m);
     };
     return Point3D;
-})(Point);
+}(Point));
diff --git a/tests/baselines/reference/avoid.js b/tests/baselines/reference/avoid.js
index ad10d2ac9bca7..391dab5e9856b 100644
--- a/tests/baselines/reference/avoid.js
+++ b/tests/baselines/reference/avoid.js
@@ -33,6 +33,6 @@ var C = (function () {
     C.prototype.g = function () {
     };
     return C;
-})();
+}());
 var z = new C().g(); // error void fn
 var N = new f(); // ok with void fn
diff --git a/tests/baselines/reference/badArraySyntax.js b/tests/baselines/reference/badArraySyntax.js
index f5ca1e0c0ba35..8cc5f1cfedaef 100644
--- a/tests/baselines/reference/badArraySyntax.js
+++ b/tests/baselines/reference/badArraySyntax.js
@@ -17,7 +17,7 @@ var Z = (function () {
         this.x = "";
     }
     return Z;
-})();
+}());
 var a1 = [];
 var a2 = new Z[];
 var a3 = new Z[]();
diff --git a/tests/baselines/reference/badThisBinding.js b/tests/baselines/reference/badThisBinding.js
index 115759411bf4e..06465711859eb 100644
--- a/tests/baselines/reference/badThisBinding.js
+++ b/tests/baselines/reference/badThisBinding.js
@@ -24,4 +24,4 @@ var Greeter = (function () {
         });
     }
     return Greeter;
-})();
+}());
diff --git a/tests/baselines/reference/baseCheck.js b/tests/baselines/reference/baseCheck.js
index 49038f37b18e0..c4210f3f6a531 100644
--- a/tests/baselines/reference/baseCheck.js
+++ b/tests/baselines/reference/baseCheck.js
@@ -39,14 +39,14 @@ var C = (function () {
     function C(x, y) {
     }
     return C;
-})();
+}());
 var ELoc = (function (_super) {
     __extends(ELoc, _super);
     function ELoc(x) {
         _super.call(this, 0, x);
     }
     return ELoc;
-})(C);
+}(C));
 var ELocVar = (function (_super) {
     __extends(ELocVar, _super);
     function ELocVar(x) {
@@ -56,7 +56,7 @@ var ELocVar = (function (_super) {
         var loc = 10;
     };
     return ELocVar;
-})(C);
+}(C));
 var D = (function (_super) {
     __extends(D, _super);
     function D(z) {
@@ -64,7 +64,7 @@ var D = (function (_super) {
         this.z = z;
     }
     return D;
-})(C); // too few params
+}(C)); // too few params
 var E = (function (_super) {
     __extends(E, _super);
     function E(z) {
@@ -72,7 +72,7 @@ var E = (function (_super) {
         this.z = z;
     }
     return E;
-})(C);
+}(C));
 var F = (function (_super) {
     __extends(F, _super);
     function F(z) {
@@ -80,7 +80,7 @@ var F = (function (_super) {
         this.z = z;
     }
     return F;
-})(C); // first param type
+}(C)); // first param type
 function f() {
     if (x < 10) {
         x = 11;
diff --git a/tests/baselines/reference/baseIndexSignatureResolution.js b/tests/baselines/reference/baseIndexSignatureResolution.js
index 8463ed58a5324..3f3fa3cc0b9ca 100644
--- a/tests/baselines/reference/baseIndexSignatureResolution.js
+++ b/tests/baselines/reference/baseIndexSignatureResolution.js
@@ -34,14 +34,14 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var x = null;
 var y = x[0];
 /*
diff --git a/tests/baselines/reference/baseTypeAfterDerivedType.js b/tests/baselines/reference/baseTypeAfterDerivedType.js
index c64239ac0c86f..b80b62712f5f9 100644
--- a/tests/baselines/reference/baseTypeAfterDerivedType.js
+++ b/tests/baselines/reference/baseTypeAfterDerivedType.js
@@ -27,4 +27,4 @@ var Derived2 = (function () {
         }
     };
     return Derived2;
-})();
+}());
diff --git a/tests/baselines/reference/baseTypeOrderChecking.js b/tests/baselines/reference/baseTypeOrderChecking.js
index 4c5fe22ea088c..66d2135f01d7d 100644
--- a/tests/baselines/reference/baseTypeOrderChecking.js
+++ b/tests/baselines/reference/baseTypeOrderChecking.js
@@ -47,23 +47,23 @@ var Class1 = (function () {
     function Class1() {
     }
     return Class1;
-})();
+}());
 var Class2 = (function (_super) {
     __extends(Class2, _super);
     function Class2() {
         _super.apply(this, arguments);
     }
     return Class2;
-})(Class1);
+}(Class1));
 var Class3 = (function () {
     function Class3() {
     }
     return Class3;
-})();
+}());
 var Class4 = (function (_super) {
     __extends(Class4, _super);
     function Class4() {
         _super.apply(this, arguments);
     }
     return Class4;
-})(Class3);
+}(Class3));
diff --git a/tests/baselines/reference/baseTypePrivateMemberClash.js b/tests/baselines/reference/baseTypePrivateMemberClash.js
index 79a44ee44d4eb..35eafe5543a93 100644
--- a/tests/baselines/reference/baseTypePrivateMemberClash.js
+++ b/tests/baselines/reference/baseTypePrivateMemberClash.js
@@ -13,9 +13,9 @@ var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 var Y = (function () {
     function Y() {
     }
     return Y;
-})();
+}());
diff --git a/tests/baselines/reference/baseTypeWrappingInstantiationChain.js b/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
index 1de1ebd4bfbe8..62d995c225e08 100644
--- a/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
+++ b/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
@@ -45,27 +45,27 @@ var C = (function (_super) {
     };
     C.prototype.method = function (t) { };
     return C;
-})(CBase);
+}(CBase));
 var CBase = (function (_super) {
     __extends(CBase, _super);
     function CBase() {
         _super.apply(this, arguments);
     }
     return CBase;
-})(CBaseBase);
+}(CBaseBase));
 var CBaseBase = (function () {
     function CBaseBase(x) {
     }
     return CBaseBase;
-})();
+}());
 var Parameter = (function () {
     function Parameter() {
     }
     Parameter.prototype.method = function (t) { };
     return Parameter;
-})();
+}());
 var Wrapper = (function () {
     function Wrapper() {
     }
     return Wrapper;
-})();
+}());
diff --git a/tests/baselines/reference/bases.js b/tests/baselines/reference/bases.js
index 0275c225dac4a..f67f754d06372 100644
--- a/tests/baselines/reference/bases.js
+++ b/tests/baselines/reference/bases.js
@@ -32,7 +32,7 @@ var B = (function () {
         any;
     }
     return B;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -40,6 +40,6 @@ var C = (function (_super) {
         any;
     }
     return C;
-})(B);
+}(B));
 new C().x;
 new C().y;
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
index abd2cc5e8747f..1c2fc896a6ad4 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
@@ -40,21 +40,21 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 var base;
 var derived;
 var derived2;
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
index e0e7bc3f32407..21a69f517fc4c 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
@@ -36,21 +36,21 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 var base;
 var derived;
 var derived2;
diff --git a/tests/baselines/reference/bestCommonTypeOfTuple2.js b/tests/baselines/reference/bestCommonTypeOfTuple2.js
index ed0b0ecb328ca..e38ce2854bd7d 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.js
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.js
@@ -32,30 +32,30 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
     return E;
-})();
+}());
 var F = (function (_super) {
     __extends(F, _super);
     function F() {
         _super.apply(this, arguments);
     }
     return F;
-})(C);
+}(C));
 var C1 = (function () {
     function C1() {
         this.i = "foo";
     }
     return C1;
-})();
+}());
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
@@ -63,7 +63,7 @@ var D1 = (function (_super) {
         this.i = "bar";
     }
     return D1;
-})(C1);
+}(C1));
 var t1;
 var t2;
 var t3;
diff --git a/tests/baselines/reference/bind1.js b/tests/baselines/reference/bind1.js
index 5027e8a03e049..c658384db8511 100644
--- a/tests/baselines/reference/bind1.js
+++ b/tests/baselines/reference/bind1.js
@@ -12,6 +12,6 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C; // this should be an unresolved symbol I error
 })(M || (M = {}));
diff --git a/tests/baselines/reference/binopAssignmentShouldHaveType.js b/tests/baselines/reference/binopAssignmentShouldHaveType.js
index e47b6dea875ca..c590efbcb5a58 100644
--- a/tests/baselines/reference/binopAssignmentShouldHaveType.js
+++ b/tests/baselines/reference/binopAssignmentShouldHaveType.js
@@ -36,6 +36,6 @@ var Test;
             }
         };
         return Bug;
-    })();
+    }());
     Test.Bug = Bug;
 })(Test || (Test = {}));
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js
index a401273135644..0236bd736ee94 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/bitwiseNotOperatorWithAnyOtherType.js
@@ -81,7 +81,7 @@ var A = (function () {
         return a;
     };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js
index d3f8c76c6ca9a..b35a5e4ba1226 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js
+++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.js
@@ -47,7 +47,7 @@ var A = (function () {
     }
     A.foo = function () { return false; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js
index 370400a7dffa6..aab04be6dfc90 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js
+++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.js
@@ -54,7 +54,7 @@ var A = (function () {
     }
     A.foo = function () { return 1; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.js b/tests/baselines/reference/bitwiseNotOperatorWithStringType.js
index 071d52e7c18d0..366af5ecea8dd 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.js
+++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.js
@@ -53,7 +53,7 @@ var A = (function () {
     }
     A.foo = function () { return ""; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js
index 5ed3ac62e6aa3..06eaa9916e31e 100644
--- a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js
+++ b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js
@@ -122,7 +122,7 @@ function foo3() {
         }
         X.prototype.m = function () { return x; };
         return X;
-    })();
+    }());
     var x;
 }
 function foo4() {
@@ -131,7 +131,7 @@ function foo4() {
         }
         class_1.prototype.m = function () { return x; };
         return class_1;
-    })();
+    }());
     var x;
 }
 function foo5() {
@@ -150,7 +150,7 @@ function foo7() {
             this.a = x;
         }
         return A;
-    })();
+    }());
     var x;
 }
 function foo8() {
@@ -159,7 +159,7 @@ function foo8() {
             this.a = x;
         }
         return class_2;
-    })();
+    }());
     var x;
 }
 function foo9() {
@@ -168,7 +168,7 @@ function foo9() {
         }
         class_3.a = x;
         return class_3;
-    })();
+    }());
     var x;
 }
 function foo10() {
@@ -177,7 +177,7 @@ function foo10() {
         }
         A.a = x;
         return A;
-    })();
+    }());
     var x;
 }
 function foo11() {
@@ -187,7 +187,7 @@ function foo11() {
             }
             class_4.a = x;
             return class_4;
-        })();
+        }());
     }
     var x;
 }
@@ -198,7 +198,7 @@ function foo12() {
                 this.a = x;
             }
             return class_5;
-        })();
+        }());
     }
     var x;
 }
diff --git a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js
index f1028956e1608..c40948273a6de 100644
--- a/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js
+++ b/tests/baselines/reference/callGenericFunctionWithIncorrectNumberOfTypeArguments.js
@@ -63,7 +63,7 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
 var r4 = (new C()).f(1, '');
 var r4b = (new C()).f(1, '');
 var i;
@@ -76,7 +76,7 @@ var C2 = (function () {
         return null;
     };
     return C2;
-})();
+}());
 var r6 = (new C2()).f(1, '');
 var r6b = (new C2()).f(1, '');
 var i2;
diff --git a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js
index 26b9d33a55d52..e78ee62edc5d4 100644
--- a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js
+++ b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.js
@@ -51,7 +51,7 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
 var r4 = (new C()).f(1);
 var i;
 var r5 = i.f(1);
@@ -62,7 +62,7 @@ var C2 = (function () {
         return null;
     };
     return C2;
-})();
+}());
 var r6 = (new C2()).f(1);
 var i2;
 var r7 = i2.f(1);
diff --git a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js
index 7b0355533e3d4..dd9a20825101a 100644
--- a/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js
+++ b/tests/baselines/reference/callNonGenericFunctionWithTypeArguments.js
@@ -59,7 +59,7 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
 var r4 = (new C()).f(1);
 var i;
 var r5 = i.f(1);
@@ -70,7 +70,7 @@ var C2 = (function () {
         return null;
     };
     return C2;
-})();
+}());
 var r6 = (new C2()).f(1);
 var i2;
 var r7 = i2.f(1);
diff --git a/tests/baselines/reference/callOnClass.js b/tests/baselines/reference/callOnClass.js
index 18127dca56c60..fbcedb9ba1ae8 100644
--- a/tests/baselines/reference/callOnClass.js
+++ b/tests/baselines/reference/callOnClass.js
@@ -9,5 +9,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = C();
diff --git a/tests/baselines/reference/callOverloadViaElementAccessExpression.js b/tests/baselines/reference/callOverloadViaElementAccessExpression.js
index 2e35c72e780b4..48f3771206e2b 100644
--- a/tests/baselines/reference/callOverloadViaElementAccessExpression.js
+++ b/tests/baselines/reference/callOverloadViaElementAccessExpression.js
@@ -19,7 +19,7 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
 var c = new C();
 var r = c['foo'](1);
 var r2 = c['foo']('');
diff --git a/tests/baselines/reference/callOverloads1.js b/tests/baselines/reference/callOverloads1.js
index b1148c12420cf..756a9099e4452 100644
--- a/tests/baselines/reference/callOverloads1.js
+++ b/tests/baselines/reference/callOverloads1.js
@@ -24,7 +24,7 @@ var Foo = (function () {
     }
     Foo.prototype.bar1 = function () { };
     return Foo;
-})();
+}());
 function F1(a) { return a; }
 var f1 = new Foo("hey");
 f1.bar1();
diff --git a/tests/baselines/reference/callOverloads2.js b/tests/baselines/reference/callOverloads2.js
index b336911eeb06b..b890ee8bde967 100644
--- a/tests/baselines/reference/callOverloads2.js
+++ b/tests/baselines/reference/callOverloads2.js
@@ -32,7 +32,7 @@ var Foo = (function () {
     }
     Foo.prototype.bar1 = function () { };
     return Foo;
-})();
+}());
 function F1(s) { return s; } // error
 function F1(a) { return a; } // error
 var f1 = new Foo("hey");
diff --git a/tests/baselines/reference/callOverloads3.js b/tests/baselines/reference/callOverloads3.js
index 3b615438ccdda..e5d678543c647 100644
--- a/tests/baselines/reference/callOverloads3.js
+++ b/tests/baselines/reference/callOverloads3.js
@@ -25,7 +25,7 @@ var Foo = (function () {
     }
     Foo.prototype.bar1 = function () { };
     return Foo;
-})();
+}());
 //class Foo(s: String);
 var f1 = new Foo("hey");
 f1.bar1();
diff --git a/tests/baselines/reference/callOverloads4.js b/tests/baselines/reference/callOverloads4.js
index 529b63ad3b822..dfb274dfb6e35 100644
--- a/tests/baselines/reference/callOverloads4.js
+++ b/tests/baselines/reference/callOverloads4.js
@@ -25,7 +25,7 @@ var Foo = (function () {
     }
     Foo.prototype.bar1 = function () { };
     return Foo;
-})();
+}());
 var f1 = new Foo("hey");
 f1.bar1();
 Foo();
diff --git a/tests/baselines/reference/callOverloads5.js b/tests/baselines/reference/callOverloads5.js
index dc508b3b8ed2e..cf159d309b0f2 100644
--- a/tests/baselines/reference/callOverloads5.js
+++ b/tests/baselines/reference/callOverloads5.js
@@ -26,7 +26,7 @@ var Foo = (function () {
     }
     Foo.prototype.bar1 = function (a) { };
     return Foo;
-})();
+}());
 //class Foo(s: String);
 var f1 = new Foo("hey");
 f1.bar1("a");
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
index e43c22fab7506..6b3bf8e125ef5 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
@@ -80,25 +80,25 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
index 6105ddf23fab9..a823047fc0d4e 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
@@ -127,26 +127,26 @@ var Errors;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
             _super.apply(this, arguments);
         }
         return Derived;
-    })(Base);
+    }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
             _super.apply(this, arguments);
         }
         return Derived2;
-    })(Derived);
+    }(Derived));
     var OtherDerived = (function (_super) {
         __extends(OtherDerived, _super);
         function OtherDerived() {
             _super.apply(this, arguments);
         }
         return OtherDerived;
-    })(Base);
+    }(Base));
 })(Errors || (Errors = {}));
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
index aee3af6f740e1..b60cf2014f1e8 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
@@ -60,25 +60,25 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
index c72a77e4020be..434af36123e8f 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
@@ -60,25 +60,25 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
index e22bb1189ed54..9776d14612eb8 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
@@ -63,25 +63,25 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js
index 0f8a033067d0f..14442dd6e2274 100644
--- a/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js
+++ b/tests/baselines/reference/callSignatureWithOptionalParameterAndInitializer.js
@@ -79,7 +79,7 @@ var C = (function () {
         if (x === void 0) { x = 1; }
     };
     return C;
-})();
+}());
 var c;
 c.foo();
 c.foo(1);
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js
index 73270c240cb34..baa7f6c2c95c1 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js
@@ -178,7 +178,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 function foo10(x) {
     var c;
     return c;
@@ -191,7 +191,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
 function foo11() {
@@ -216,7 +216,7 @@ var c1 = (function () {
     function c1(x) {
     }
     return c1;
-})();
+}());
 var c1;
 (function (c1) {
     c1.x = 1;
diff --git a/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js b/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js
index 5584dd7b216a2..dba88c4951e21 100644
--- a/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js
+++ b/tests/baselines/reference/callSignaturesWithAccessibilityModifiersOnParameters.js
@@ -57,7 +57,7 @@ var C = (function () {
     C.prototype.foo2 = function (x, y) { };
     C.prototype.foo3 = function (x, y) { };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: function (x, y) { },
diff --git a/tests/baselines/reference/callSignaturesWithDuplicateParameters.js b/tests/baselines/reference/callSignaturesWithDuplicateParameters.js
index 6ed7f6f7fe509..add9e07ea4b83 100644
--- a/tests/baselines/reference/callSignaturesWithDuplicateParameters.js
+++ b/tests/baselines/reference/callSignaturesWithDuplicateParameters.js
@@ -57,7 +57,7 @@ var C = (function () {
     C.prototype.foo2 = function (x, x) { };
     C.prototype.foo3 = function (x, x) { };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: function (x, x) { },
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters.js b/tests/baselines/reference/callSignaturesWithOptionalParameters.js
index 2f4876fb2deac..a0a3835c9432a 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters.js
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters.js
@@ -71,7 +71,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { };
     return C;
-})();
+}());
 var c;
 c.foo();
 c.foo(1);
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters2.js b/tests/baselines/reference/callSignaturesWithOptionalParameters2.js
index a3fb2fe7a8594..973b0466a79e1 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters2.js
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters2.js
@@ -73,7 +73,7 @@ var C = (function () {
     C.prototype.foo = function (x) { };
     C.prototype.foo2 = function (x, y) { };
     return C;
-})();
+}());
 var c;
 c.foo();
 c.foo(1);
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers.js b/tests/baselines/reference/callSignaturesWithParameterInitializers.js
index c95a558e4c84e..8b53d5b29d52f 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers.js
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers.js
@@ -81,7 +81,7 @@ var C = (function () {
         if (x === void 0) { x = 1; }
     };
     return C;
-})();
+}());
 var c;
 c.foo();
 c.foo(1);
diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers2.js b/tests/baselines/reference/callSignaturesWithParameterInitializers2.js
index 0524db42f653a..fd1dd369010eb 100644
--- a/tests/baselines/reference/callSignaturesWithParameterInitializers2.js
+++ b/tests/baselines/reference/callSignaturesWithParameterInitializers2.js
@@ -40,7 +40,7 @@ var C = (function () {
         if (x === void 0) { x = 1; }
     };
     return C;
-})();
+}());
 var c;
 c.foo();
 c.foo(1);
diff --git a/tests/baselines/reference/callWithSpread.js b/tests/baselines/reference/callWithSpread.js
index 50840abfbb746..e89e9d9345bc8 100644
--- a/tests/baselines/reference/callWithSpread.js
+++ b/tests/baselines/reference/callWithSpread.js
@@ -95,7 +95,7 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -107,5 +107,5 @@ var D = (function (_super) {
         _super.prototype.foo.apply(this, [1, 2].concat(a));
     };
     return D;
-})(C);
+}(C));
 var _a, _b, _c;
diff --git a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js
index 2b05f8d33890d..4b25c75b0aa2b 100644
--- a/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js
+++ b/tests/baselines/reference/cannotInvokeNewOnErrorExpression.js
@@ -12,6 +12,6 @@ var M;
         function ClassA() {
         }
         return ClassA;
-    })();
+    }());
 })(M || (M = {}));
 var t = new M.ClassA[];
diff --git a/tests/baselines/reference/captureThisInSuperCall.js b/tests/baselines/reference/captureThisInSuperCall.js
index 611ad93f5317c..791b6f4c97956 100644
--- a/tests/baselines/reference/captureThisInSuperCall.js
+++ b/tests/baselines/reference/captureThisInSuperCall.js
@@ -18,7 +18,7 @@ var A = (function () {
     function A(p) {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -27,4 +27,4 @@ var B = (function (_super) {
     }
     B.prototype.someMethod = function () { };
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/capturedLetConstInLoop10.js b/tests/baselines/reference/capturedLetConstInLoop10.js
index 36b2ab9453fb9..b493dcbd2880d 100644
--- a/tests/baselines/reference/capturedLetConstInLoop10.js
+++ b/tests/baselines/reference/capturedLetConstInLoop10.js
@@ -101,7 +101,7 @@ var A = (function () {
         }
     };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
@@ -121,4 +121,4 @@ var B = (function () {
     B.prototype.bar = function (a) {
     };
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/capturedLetConstInLoop9.js b/tests/baselines/reference/capturedLetConstInLoop9.js
index 93aef628f8a6f..9b31218a1e3d3 100644
--- a/tests/baselines/reference/capturedLetConstInLoop9.js
+++ b/tests/baselines/reference/capturedLetConstInLoop9.js
@@ -171,7 +171,7 @@ var _loop_1 = function(x) {
             return x_1 + 1;
         };
         return A;
-    })();
+    }());
 };
 for (var x = 0; x < 1; ++x) {
     _loop_1(x);
@@ -280,7 +280,7 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
 function foo3() {
     var x = arguments.length;
     var _loop_6 = function(y) {
diff --git a/tests/baselines/reference/castParentheses.js b/tests/baselines/reference/castParentheses.js
index 8ee31be63f9c5..936b2e7af074b 100644
--- a/tests/baselines/reference/castParentheses.js
+++ b/tests/baselines/reference/castParentheses.js
@@ -16,7 +16,7 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = a;
 var b = a.b;
 var b = a.b.c;
diff --git a/tests/baselines/reference/castingTuple.js b/tests/baselines/reference/castingTuple.js
index 0102d1310a328..bcff0938157c0 100644
--- a/tests/baselines/reference/castingTuple.js
+++ b/tests/baselines/reference/castingTuple.js
@@ -43,18 +43,18 @@ var A = (function () {
         this.a = 10;
     }
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 ;
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 ;
 var E = (function (_super) {
     __extends(E, _super);
@@ -62,7 +62,7 @@ var E = (function (_super) {
         _super.apply(this, arguments);
     }
     return E;
-})(A);
+}(A));
 ;
 var F = (function (_super) {
     __extends(F, _super);
@@ -70,7 +70,7 @@ var F = (function (_super) {
         _super.apply(this, arguments);
     }
     return F;
-})(A);
+}(A));
 ;
 var E1;
 (function (E1) {
diff --git a/tests/baselines/reference/chainedAssignment1.js b/tests/baselines/reference/chainedAssignment1.js
index ac637b7def257..8f13477bdefcc 100644
--- a/tests/baselines/reference/chainedAssignment1.js
+++ b/tests/baselines/reference/chainedAssignment1.js
@@ -28,18 +28,18 @@ var X = (function () {
         this.z = z;
     }
     return X;
-})();
+}());
 var Y = (function () {
     function Y(z) {
         this.z = z;
     }
     return Y;
-})();
+}());
 var Z = (function () {
     function Z() {
     }
     return Z;
-})();
+}());
 var c1 = new X(3);
 var c2 = new Y(5);
 var c3 = new Z();
diff --git a/tests/baselines/reference/chainedAssignment3.js b/tests/baselines/reference/chainedAssignment3.js
index 04c328031cda2..b4b6330a7cf76 100644
--- a/tests/baselines/reference/chainedAssignment3.js
+++ b/tests/baselines/reference/chainedAssignment3.js
@@ -32,14 +32,14 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var a;
 var b;
 a = b = null;
diff --git a/tests/baselines/reference/chainedAssignmentChecking.js b/tests/baselines/reference/chainedAssignmentChecking.js
index e9c66ab36819b..4d9fbfa48a15b 100644
--- a/tests/baselines/reference/chainedAssignmentChecking.js
+++ b/tests/baselines/reference/chainedAssignmentChecking.js
@@ -28,18 +28,18 @@ var X = (function () {
         this.z = z;
     }
     return X;
-})();
+}());
 var Y = (function () {
     function Y(z) {
         this.z = z;
     }
     return Y;
-})();
+}());
 var Z = (function () {
     function Z() {
     }
     return Z;
-})();
+}());
 var c1 = new X(3);
 var c2 = new Y(5);
 var c3 = new Z();
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
index e7e1a3a871b09..c53910e00acad 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
@@ -33,25 +33,25 @@ var Chain = (function () {
         return null;
     };
     return Chain;
-})();
+}());
 var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(B);
+}(B));
 // Ok to go down the chain, but error to try to climb back up
 (new Chain(new A)).then(function (a) { return new B; }).then(function (b) { return new C; }).then(function (c) { return new B; }).then(function (b) { return new A; });
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js
index 3b9b8b80ecffb..8aa5594701f25 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.js
@@ -59,7 +59,7 @@ var Chain = (function () {
         return null;
     };
     return Chain;
-})();
+}());
 var Chain2 = (function () {
     function Chain2(value) {
         this.value = value;
@@ -78,4 +78,4 @@ var Chain2 = (function () {
         return null;
     };
     return Chain2;
-})();
+}());
diff --git a/tests/baselines/reference/checkForObjectTooStrict.js b/tests/baselines/reference/checkForObjectTooStrict.js
index d8f40a3f1d9fd..cdc19a5688de4 100644
--- a/tests/baselines/reference/checkForObjectTooStrict.js
+++ b/tests/baselines/reference/checkForObjectTooStrict.js
@@ -43,7 +43,7 @@ var Foo;
         function Object() {
         }
         return Object;
-    })();
+    }());
     Foo.Object = Object;
 })(Foo || (Foo = {}));
 var Bar = (function (_super) {
@@ -52,11 +52,11 @@ var Bar = (function (_super) {
         _super.call(this);
     }
     return Bar;
-})(Foo.Object);
+}(Foo.Object));
 var Baz = (function (_super) {
     __extends(Baz, _super);
     function Baz() {
         _super.call(this);
     }
     return Baz;
-})(Object);
+}(Object));
diff --git a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js
index 64ea4e67fa8a7..a5eb24c671680 100644
--- a/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js
+++ b/tests/baselines/reference/checkSwitchStatementIfCaseTypeIsString.js
@@ -24,4 +24,4 @@ var A = (function () {
         });
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/circularImportAlias.js b/tests/baselines/reference/circularImportAlias.js
index 8b908a97ee6fb..19c156176bfbd 100644
--- a/tests/baselines/reference/circularImportAlias.js
+++ b/tests/baselines/reference/circularImportAlias.js
@@ -35,7 +35,7 @@ var B;
             _super.apply(this, arguments);
         }
         return D;
-    })(B.a.C);
+    }(B.a.C));
     B.D = D;
 })(B || (B = {}));
 var A;
@@ -44,7 +44,7 @@ var A;
         function C() {
         }
         return C;
-    })();
+    }());
     A.C = C;
     A.b = B;
 })(A || (A = {}));
diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js
index ca072952b535d..52fe5f3ef54c9 100644
--- a/tests/baselines/reference/circularReference.js
+++ b/tests/baselines/reference/circularReference.js
@@ -45,7 +45,7 @@ var M1;
             this.m1.x = 20; // Error
         }
         return C1;
-    })();
+    }());
     M1.C1 = C1;
 })(M1 = exports.M1 || (exports.M1 = {}));
 //// [foo2.js]
@@ -63,6 +63,6 @@ var M1;
             tmp.x = 20; // Error			
         }
         return C1;
-    })();
+    }());
     M1.C1 = C1;
 })(M1 = exports.M1 || (exports.M1 = {}));
diff --git a/tests/baselines/reference/circularTypeAliasForUnionWithClass.js b/tests/baselines/reference/circularTypeAliasForUnionWithClass.js
index 90a113648975e..bac0eb66b2683 100644
--- a/tests/baselines/reference/circularTypeAliasForUnionWithClass.js
+++ b/tests/baselines/reference/circularTypeAliasForUnionWithClass.js
@@ -24,16 +24,16 @@ var I0 = (function () {
     function I0() {
     }
     return I0;
-})();
+}());
 var v3;
 var I3 = (function () {
     function I3() {
     }
     return I3;
-})();
+}());
 var v4;
 var I4 = (function () {
     function I4() {
     }
     return I4;
-})();
+}());
diff --git a/tests/baselines/reference/class2.js b/tests/baselines/reference/class2.js
index 03b60ac8dc56e..6ef78ed46ee9a 100644
--- a/tests/baselines/reference/class2.js
+++ b/tests/baselines/reference/class2.js
@@ -7,4 +7,4 @@ var foo = (function () {
     }
     foo.f = 3;
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/classAbstractAsIdentifier.js b/tests/baselines/reference/classAbstractAsIdentifier.js
index 6adadd346b599..44a2b0d331295 100644
--- a/tests/baselines/reference/classAbstractAsIdentifier.js
+++ b/tests/baselines/reference/classAbstractAsIdentifier.js
@@ -11,5 +11,5 @@ var abstract = (function () {
     }
     abstract.prototype.foo = function () { return 1; };
     return abstract;
-})();
+}());
 new abstract;
diff --git a/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.js b/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.js
index 3d8fd404afc38..523f87e5a6424 100644
--- a/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.js
+++ b/tests/baselines/reference/classAbstractAssignabilityConstructorFunction.js
@@ -13,7 +13,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 // var AA: typeof A;
 var AAA;
 // AA = A; // okay
diff --git a/tests/baselines/reference/classAbstractClinterfaceAssignability.js b/tests/baselines/reference/classAbstractClinterfaceAssignability.js
index cbcf9dd189cb6..f61fb1dbbd52d 100644
--- a/tests/baselines/reference/classAbstractClinterfaceAssignability.js
+++ b/tests/baselines/reference/classAbstractClinterfaceAssignability.js
@@ -29,7 +29,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var AA;
 AA = I;
 var AAA;
diff --git a/tests/baselines/reference/classAbstractConstructor.js b/tests/baselines/reference/classAbstractConstructor.js
index fa88b0c7d3796..4dd4ee042f027 100644
--- a/tests/baselines/reference/classAbstractConstructor.js
+++ b/tests/baselines/reference/classAbstractConstructor.js
@@ -8,4 +8,4 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/classAbstractConstructorAssignability.js b/tests/baselines/reference/classAbstractConstructorAssignability.js
index 04357a445543e..5695e6c79d3cb 100644
--- a/tests/baselines/reference/classAbstractConstructorAssignability.js
+++ b/tests/baselines/reference/classAbstractConstructorAssignability.js
@@ -24,21 +24,21 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(B);
+}(B));
 var AA = B;
 var BB = A;
 var CC = B;
diff --git a/tests/baselines/reference/classAbstractCrashedOnce.js b/tests/baselines/reference/classAbstractCrashedOnce.js
index f4268a4a13c9f..46f0a8938c417 100644
--- a/tests/baselines/reference/classAbstractCrashedOnce.js
+++ b/tests/baselines/reference/classAbstractCrashedOnce.js
@@ -20,7 +20,7 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
 var bar = (function (_super) {
     __extends(bar, _super);
     function bar() {
@@ -31,5 +31,5 @@ var bar = (function (_super) {
         ;
     };
     return bar;
-})(foo);
+}(foo));
 var x = new bar();
diff --git a/tests/baselines/reference/classAbstractExtends.js b/tests/baselines/reference/classAbstractExtends.js
index 58e49de2c7795..8d7128cc03d30 100644
--- a/tests/baselines/reference/classAbstractExtends.js
+++ b/tests/baselines/reference/classAbstractExtends.js
@@ -27,28 +27,28 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(B);
+}(B));
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(B);
+}(B));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -56,4 +56,4 @@ var E = (function (_super) {
     }
     E.prototype.bar = function () { };
     return E;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/classAbstractFactoryFunction.js b/tests/baselines/reference/classAbstractFactoryFunction.js
index b1d89ba385da1..d5b0417f99596 100644
--- a/tests/baselines/reference/classAbstractFactoryFunction.js
+++ b/tests/baselines/reference/classAbstractFactoryFunction.js
@@ -27,14 +27,14 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 function NewA(Factory) {
     return new A;
 }
diff --git a/tests/baselines/reference/classAbstractGeneric.js b/tests/baselines/reference/classAbstractGeneric.js
index 5af7da1601a99..c9409e9746687 100644
--- a/tests/baselines/reference/classAbstractGeneric.js
+++ b/tests/baselines/reference/classAbstractGeneric.js
@@ -35,28 +35,28 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A); // error -- inherits abstract methods
+}(A)); // error -- inherits abstract methods
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(A); // error -- inherits abstract methods
+}(A)); // error -- inherits abstract methods
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -64,7 +64,7 @@ var E = (function (_super) {
     }
     E.prototype.foo = function () { return this.t; };
     return E;
-})(A);
+}(A));
 var F = (function (_super) {
     __extends(F, _super);
     function F() {
@@ -72,7 +72,7 @@ var F = (function (_super) {
     }
     F.prototype.bar = function (t) { };
     return F;
-})(A);
+}(A));
 var G = (function (_super) {
     __extends(G, _super);
     function G() {
@@ -81,4 +81,4 @@ var G = (function (_super) {
     G.prototype.foo = function () { return this.t; };
     G.prototype.bar = function (t) { };
     return G;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/classAbstractImportInstantiation.js b/tests/baselines/reference/classAbstractImportInstantiation.js
index bb25181f20d8f..4c837d67f386b 100644
--- a/tests/baselines/reference/classAbstractImportInstantiation.js
+++ b/tests/baselines/reference/classAbstractImportInstantiation.js
@@ -17,7 +17,7 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     new A;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/classAbstractInAModule.js b/tests/baselines/reference/classAbstractInAModule.js
index e7ecd66b5bd04..17fbf568601b9 100644
--- a/tests/baselines/reference/classAbstractInAModule.js
+++ b/tests/baselines/reference/classAbstractInAModule.js
@@ -19,7 +19,7 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     var B = (function (_super) {
         __extends(B, _super);
@@ -27,7 +27,7 @@ var M;
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     M.B = B;
 })(M || (M = {}));
 new M.A;
diff --git a/tests/baselines/reference/classAbstractInheritance.js b/tests/baselines/reference/classAbstractInheritance.js
index 6656e4687d239..4d5c804e55784 100644
--- a/tests/baselines/reference/classAbstractInheritance.js
+++ b/tests/baselines/reference/classAbstractInheritance.js
@@ -31,65 +31,65 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 var AA = (function () {
     function AA() {
     }
     return AA;
-})();
+}());
 var BB = (function (_super) {
     __extends(BB, _super);
     function BB() {
         _super.apply(this, arguments);
     }
     return BB;
-})(AA);
+}(AA));
 var CC = (function (_super) {
     __extends(CC, _super);
     function CC() {
         _super.apply(this, arguments);
     }
     return CC;
-})(AA);
+}(AA));
 var DD = (function (_super) {
     __extends(DD, _super);
     function DD() {
         _super.apply(this, arguments);
     }
     return DD;
-})(BB);
+}(BB));
 var EE = (function (_super) {
     __extends(EE, _super);
     function EE() {
         _super.apply(this, arguments);
     }
     return EE;
-})(BB);
+}(BB));
 var FF = (function (_super) {
     __extends(FF, _super);
     function FF() {
         _super.apply(this, arguments);
     }
     return FF;
-})(CC);
+}(CC));
 var GG = (function (_super) {
     __extends(GG, _super);
     function GG() {
         _super.apply(this, arguments);
     }
     return GG;
-})(CC);
+}(CC));
diff --git a/tests/baselines/reference/classAbstractInstantiations1.js b/tests/baselines/reference/classAbstractInstantiations1.js
index 689a78f1a06ac..0263e9e97b36c 100644
--- a/tests/baselines/reference/classAbstractInstantiations1.js
+++ b/tests/baselines/reference/classAbstractInstantiations1.js
@@ -37,21 +37,21 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(B);
+}(B));
 new A;
 new A(1); // should report 1 error
 new B;
diff --git a/tests/baselines/reference/classAbstractInstantiations2.js b/tests/baselines/reference/classAbstractInstantiations2.js
index 1f45f02da0bb0..379e0b18cccde 100644
--- a/tests/baselines/reference/classAbstractInstantiations2.js
+++ b/tests/baselines/reference/classAbstractInstantiations2.js
@@ -61,13 +61,13 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function () { return this.bar(); };
     return B;
-})();
+}());
 new B; // error
 var BB = B;
 var AA = BB; // error, AA is not of abstract type.
@@ -85,14 +85,14 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(B); // error -- not declared abstract
+}(B)); // error -- not declared abstract
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(B); // okay
+}(B)); // okay
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -100,7 +100,7 @@ var E = (function (_super) {
     }
     E.prototype.bar = function () { return 1; };
     return E;
-})(B);
+}(B));
 var F = (function (_super) {
     __extends(F, _super);
     function F() {
@@ -108,14 +108,14 @@ var F = (function (_super) {
     }
     F.prototype.bar = function () { return 2; };
     return F;
-})(B);
+}(B));
 var G = (function () {
     function G() {
     }
     return G;
-})();
+}());
 var H = (function () {
     function H() {
     }
     return H;
-})();
+}());
diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js
index 1be5a06195c63..2708806a0d11b 100644
--- a/tests/baselines/reference/classAbstractManyKeywords.js
+++ b/tests/baselines/reference/classAbstractManyKeywords.js
@@ -10,20 +10,20 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 exports.B = B;
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/classAbstractMergedDeclaration.js b/tests/baselines/reference/classAbstractMergedDeclaration.js
index f6a91f870d299..d89138bd3ff36 100644
--- a/tests/baselines/reference/classAbstractMergedDeclaration.js
+++ b/tests/baselines/reference/classAbstractMergedDeclaration.js
@@ -45,42 +45,42 @@ var CM = (function () {
     function CM() {
     }
     return CM;
-})();
+}());
 var MC = (function () {
     function MC() {
     }
     return MC;
-})();
+}());
 var CI = (function () {
     function CI() {
     }
     return CI;
-})();
+}());
 var IC = (function () {
     function IC() {
     }
     return IC;
-})();
+}());
 var CC1 = (function () {
     function CC1() {
     }
     return CC1;
-})();
+}());
 var CC1 = (function () {
     function CC1() {
     }
     return CC1;
-})();
+}());
 var CC2 = (function () {
     function CC2() {
     }
     return CC2;
-})();
+}());
 var CC2 = (function () {
     function CC2() {
     }
     return CC2;
-})();
+}());
 new CM;
 new MC;
 new CI;
diff --git a/tests/baselines/reference/classAbstractMethodInNonAbstractClass.js b/tests/baselines/reference/classAbstractMethodInNonAbstractClass.js
index 6a38440cf414d..b4bf0595a3e48 100644
--- a/tests/baselines/reference/classAbstractMethodInNonAbstractClass.js
+++ b/tests/baselines/reference/classAbstractMethodInNonAbstractClass.js
@@ -12,10 +12,10 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function () { };
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/classAbstractMethodWithImplementation.js b/tests/baselines/reference/classAbstractMethodWithImplementation.js
index d931901271230..aa373d1d2040f 100644
--- a/tests/baselines/reference/classAbstractMethodWithImplementation.js
+++ b/tests/baselines/reference/classAbstractMethodWithImplementation.js
@@ -9,4 +9,4 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/classAbstractMixedWithModifiers.js b/tests/baselines/reference/classAbstractMixedWithModifiers.js
index 71eb4c61c048e..5343d4a394730 100644
--- a/tests/baselines/reference/classAbstractMixedWithModifiers.js
+++ b/tests/baselines/reference/classAbstractMixedWithModifiers.js
@@ -20,4 +20,4 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/classAbstractOverloads.js b/tests/baselines/reference/classAbstractOverloads.js
index 1bdff73d5b781..11a694484f3e5 100644
--- a/tests/baselines/reference/classAbstractOverloads.js
+++ b/tests/baselines/reference/classAbstractOverloads.js
@@ -30,9 +30,9 @@ var A = (function () {
     }
     A.prototype.baz = function () { };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/classAbstractOverrideWithAbstract.js b/tests/baselines/reference/classAbstractOverrideWithAbstract.js
index fb03192f35ebd..d613dd1fe31f5 100644
--- a/tests/baselines/reference/classAbstractOverrideWithAbstract.js
+++ b/tests/baselines/reference/classAbstractOverrideWithAbstract.js
@@ -34,20 +34,20 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var AA = (function () {
     function AA() {
     }
     AA.prototype.foo = function () { };
     return AA;
-})();
+}());
 var BB = (function (_super) {
     __extends(BB, _super);
     function BB() {
@@ -55,14 +55,14 @@ var BB = (function (_super) {
     }
     BB.prototype.bar = function () { };
     return BB;
-})(AA);
+}(AA));
 var CC = (function (_super) {
     __extends(CC, _super);
     function CC() {
         _super.apply(this, arguments);
     }
     return CC;
-})(BB); // error
+}(BB)); // error
 var DD = (function (_super) {
     __extends(DD, _super);
     function DD() {
@@ -70,4 +70,4 @@ var DD = (function (_super) {
     }
     DD.prototype.foo = function () { };
     return DD;
-})(BB);
+}(BB));
diff --git a/tests/baselines/reference/classAbstractProperties.js b/tests/baselines/reference/classAbstractProperties.js
index 0cbebcf0de0e5..b5097bc3f0d7a 100644
--- a/tests/baselines/reference/classAbstractProperties.js
+++ b/tests/baselines/reference/classAbstractProperties.js
@@ -18,4 +18,4 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/classAbstractSingleLineDecl.js b/tests/baselines/reference/classAbstractSingleLineDecl.js
index 772ed564a6613..5dfd7081339ba 100644
--- a/tests/baselines/reference/classAbstractSingleLineDecl.js
+++ b/tests/baselines/reference/classAbstractSingleLineDecl.js
@@ -17,19 +17,19 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 abstract;
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 abstract;
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 new A;
 new B;
 new C;
diff --git a/tests/baselines/reference/classAbstractSuperCalls.js b/tests/baselines/reference/classAbstractSuperCalls.js
index deccaa50ccf27..7ada903974cb8 100644
--- a/tests/baselines/reference/classAbstractSuperCalls.js
+++ b/tests/baselines/reference/classAbstractSuperCalls.js
@@ -38,7 +38,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { return 1; };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -47,7 +47,7 @@ var B = (function (_super) {
     B.prototype.bar = function () { _super.prototype.foo.call(this); };
     B.prototype.baz = function () { return this.foo; };
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -57,18 +57,18 @@ var C = (function (_super) {
     C.prototype.qux = function () { return _super.prototype.foo.call(this) || _super.prototype.foo; }; // 2 errors, foo is abstract
     C.prototype.norf = function () { return _super.prototype.bar.call(this); };
     return C;
-})(B);
+}(B));
 var AA = (function () {
     function AA() {
     }
     AA.prototype.foo = function () { return 1; };
     AA.prototype.bar = function () { return this.foo(); };
     return AA;
-})();
+}());
 var BB = (function (_super) {
     __extends(BB, _super);
     function BB() {
         _super.apply(this, arguments);
     }
     return BB;
-})(AA);
+}(AA));
diff --git a/tests/baselines/reference/classAbstractUsingAbstractMethod1.js b/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
index 18d22803a7d73..457195f5449aa 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
@@ -27,7 +27,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -35,14 +35,14 @@ var B = (function (_super) {
     }
     B.prototype.foo = function () { return 1; };
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 var a = new B;
 a.foo();
 a = new C; // error, cannot instantiate abstract class.
diff --git a/tests/baselines/reference/classAbstractUsingAbstractMethods2.js b/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
index d579723292990..dc025b11ddec1 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
@@ -37,21 +37,21 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -59,7 +59,7 @@ var D = (function (_super) {
     }
     D.prototype.foo = function () { };
     return D;
-})(A);
+}(A));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -67,26 +67,26 @@ var E = (function (_super) {
     }
     E.prototype.foo = function () { };
     return E;
-})(A);
+}(A));
 var AA = (function () {
     function AA() {
     }
     return AA;
-})();
+}());
 var BB = (function (_super) {
     __extends(BB, _super);
     function BB() {
         _super.apply(this, arguments);
     }
     return BB;
-})(AA);
+}(AA));
 var CC = (function (_super) {
     __extends(CC, _super);
     function CC() {
         _super.apply(this, arguments);
     }
     return CC;
-})(AA);
+}(AA));
 var DD = (function (_super) {
     __extends(DD, _super);
     function DD() {
@@ -94,4 +94,4 @@ var DD = (function (_super) {
     }
     DD.prototype.foo = function () { };
     return DD;
-})(AA);
+}(AA));
diff --git a/tests/baselines/reference/classAndInterfaceWithSameName.js b/tests/baselines/reference/classAndInterfaceWithSameName.js
index bca0c96892c77..4a5c64ee553ff 100644
--- a/tests/baselines/reference/classAndInterfaceWithSameName.js
+++ b/tests/baselines/reference/classAndInterfaceWithSameName.js
@@ -17,12 +17,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var M;
 (function (M) {
     var D = (function () {
         function D() {
         }
         return D;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/classAndVariableWithSameName.js b/tests/baselines/reference/classAndVariableWithSameName.js
index 1d547dc550884..1a88efcf19b43 100644
--- a/tests/baselines/reference/classAndVariableWithSameName.js
+++ b/tests/baselines/reference/classAndVariableWithSameName.js
@@ -15,7 +15,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})(); // error
+}()); // error
 var C = ''; // error
 var M;
 (function (M) {
@@ -23,6 +23,6 @@ var M;
         function D() {
         }
         return D;
-    })();
+    }());
     var D = 1; // error
 })(M || (M = {}));
diff --git a/tests/baselines/reference/classAppearsToHaveMembersOfObject.js b/tests/baselines/reference/classAppearsToHaveMembersOfObject.js
index e33b2b79fa8d2..e8f15583ebc99 100644
--- a/tests/baselines/reference/classAppearsToHaveMembersOfObject.js
+++ b/tests/baselines/reference/classAppearsToHaveMembersOfObject.js
@@ -13,7 +13,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var r = c.toString();
 var r2 = c.hasOwnProperty('');
diff --git a/tests/baselines/reference/classBodyWithStatements.js b/tests/baselines/reference/classBodyWithStatements.js
index 2324fe0d791ba..a40d27e14ec48 100644
--- a/tests/baselines/reference/classBodyWithStatements.js
+++ b/tests/baselines/reference/classBodyWithStatements.js
@@ -18,13 +18,13 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var x = 1;
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 function foo() { }
 var x = 1;
 var y = 2;
@@ -33,4 +33,4 @@ var C3 = (function () {
         this.x = y + 1; // ok, need a var in the statement production
     }
     return C3;
-})();
+}());
diff --git a/tests/baselines/reference/classCannotExtendVar.js b/tests/baselines/reference/classCannotExtendVar.js
index 46e89c1941846..a126a07a2eb1b 100644
--- a/tests/baselines/reference/classCannotExtendVar.js
+++ b/tests/baselines/reference/classCannotExtendVar.js
@@ -13,4 +13,4 @@ var Markup = (function () {
     function Markup() {
     }
     return Markup;
-})();
+}());
diff --git a/tests/baselines/reference/classConstructorAccessibility.js b/tests/baselines/reference/classConstructorAccessibility.js
index 15b12190392a4..fed963858454b 100644
--- a/tests/baselines/reference/classConstructorAccessibility.js
+++ b/tests/baselines/reference/classConstructorAccessibility.js
@@ -40,19 +40,19 @@ var C = (function () {
         this.x = x;
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x) {
         this.x = x;
     } // error
     return D;
-})();
+}());
 var E = (function () {
     function E(x) {
         this.x = x;
     } // error
     return E;
-})();
+}());
 var c = new C(1);
 var d = new D(1);
 var e = new E(1);
@@ -63,19 +63,19 @@ var Generic;
             this.x = x;
         }
         return C;
-    })();
+    }());
     var D = (function () {
         function D(x) {
             this.x = x;
         } // error
         return D;
-    })();
+    }());
     var E = (function () {
         function E(x) {
             this.x = x;
         } // error
         return E;
-    })();
+    }());
     var c = new C(1);
     var d = new D(1);
     var e = new E(1);
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility.js b/tests/baselines/reference/classConstructorParametersAccessibility.js
index a5538b66ecce5..c31fd8bf9dd15 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.js
@@ -37,7 +37,7 @@ var C1 = (function () {
         this.x = x;
     }
     return C1;
-})();
+}());
 var c1;
 c1.x; // OK
 var C2 = (function () {
@@ -45,7 +45,7 @@ var C2 = (function () {
         this.p = p;
     }
     return C2;
-})();
+}());
 var c2;
 c2.p; // private, error
 var C3 = (function () {
@@ -53,7 +53,7 @@ var C3 = (function () {
         this.p = p;
     }
     return C3;
-})();
+}());
 var c3;
 c3.p; // protected, error
 var Derived = (function (_super) {
@@ -63,4 +63,4 @@ var Derived = (function (_super) {
         this.p; // OK
     }
     return Derived;
-})(C3);
+}(C3));
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility2.js b/tests/baselines/reference/classConstructorParametersAccessibility2.js
index 581746a180bbe..7f52a6a581fc2 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.js
@@ -37,7 +37,7 @@ var C1 = (function () {
         this.x = x;
     }
     return C1;
-})();
+}());
 var c1;
 c1.x; // OK
 var C2 = (function () {
@@ -45,7 +45,7 @@ var C2 = (function () {
         this.p = p;
     }
     return C2;
-})();
+}());
 var c2;
 c2.p; // private, error
 var C3 = (function () {
@@ -53,7 +53,7 @@ var C3 = (function () {
         this.p = p;
     }
     return C3;
-})();
+}());
 var c3;
 c3.p; // protected, error
 var Derived = (function (_super) {
@@ -63,4 +63,4 @@ var Derived = (function (_super) {
         this.p; // OK
     }
     return Derived;
-})(C3);
+}(C3));
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility3.js b/tests/baselines/reference/classConstructorParametersAccessibility3.js
index d98b094ccdb4d..0da9449a3a71f 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility3.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility3.js
@@ -24,7 +24,7 @@ var Base = (function () {
         this.p = p;
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived(p) {
@@ -33,6 +33,6 @@ var Derived = (function (_super) {
         this.p; // OK
     }
     return Derived;
-})(Base);
+}(Base));
 var d;
 d.p; // public, OK
diff --git a/tests/baselines/reference/classDeclarationBlockScoping1.js b/tests/baselines/reference/classDeclarationBlockScoping1.js
index 4c7f9d8e24abd..ac3195af6966e 100644
--- a/tests/baselines/reference/classDeclarationBlockScoping1.js
+++ b/tests/baselines/reference/classDeclarationBlockScoping1.js
@@ -12,11 +12,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 {
     var C_1 = (function () {
         function C_1() {
         }
         return C_1;
-    })();
+    }());
 }
diff --git a/tests/baselines/reference/classDeclarationBlockScoping2.js b/tests/baselines/reference/classDeclarationBlockScoping2.js
index 57001d0d2872a..c3e3a89677ad0 100644
--- a/tests/baselines/reference/classDeclarationBlockScoping2.js
+++ b/tests/baselines/reference/classDeclarationBlockScoping2.js
@@ -15,14 +15,14 @@ function f() {
         function C() {
         }
         return C;
-    })();
+    }());
     var c1 = C;
     {
         var C_1 = (function () {
             function C_1() {
             }
             return C_1;
-        })();
+        }());
         var c2 = C_1;
     }
     return C === c1;
diff --git a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
index a8d6fcd88e0ef..7ab6cb2cecaf4 100644
--- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
+++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
@@ -23,7 +23,7 @@ var M;
         function N() {
         }
         return N;
-    })();
+    }());
     M.N = N;
     var N;
     (function (N) {
@@ -38,6 +38,6 @@ var M;
             _super.apply(this, arguments);
         }
         return O;
-    })(M.N);
+    }(M.N));
     M.O = O;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/classDoesNotDependOnBaseTypes.js b/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
index 8515e1d98eb01..5a455edc082a7 100644
--- a/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
+++ b/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
@@ -27,11 +27,11 @@ var StringTreeCollectionBase = (function () {
     function StringTreeCollectionBase() {
     }
     return StringTreeCollectionBase;
-})();
+}());
 var StringTreeCollection = (function (_super) {
     __extends(StringTreeCollection, _super);
     function StringTreeCollection() {
         _super.apply(this, arguments);
     }
     return StringTreeCollection;
-})(StringTreeCollectionBase);
+}(StringTreeCollectionBase));
diff --git a/tests/baselines/reference/classDoesNotDependOnPrivateMember.js b/tests/baselines/reference/classDoesNotDependOnPrivateMember.js
index 548c94b0ea736..3fe2c5920705e 100644
--- a/tests/baselines/reference/classDoesNotDependOnPrivateMember.js
+++ b/tests/baselines/reference/classDoesNotDependOnPrivateMember.js
@@ -13,7 +13,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
 
diff --git a/tests/baselines/reference/classExpression.js b/tests/baselines/reference/classExpression.js
index 8f3270d13e7f5..d30ddd39be888 100644
--- a/tests/baselines/reference/classExpression.js
+++ b/tests/baselines/reference/classExpression.js
@@ -17,13 +17,13 @@ var x = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var y = {
     foo: (function () {
         function C2() {
         }
         return C2;
-    })()
+    }())
 };
 var M;
 (function (M) {
@@ -31,5 +31,5 @@ var M;
         function C4() {
         }
         return C4;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/classExpression1.js b/tests/baselines/reference/classExpression1.js
index 68c7bc5e1e72c..05375bb810bd0 100644
--- a/tests/baselines/reference/classExpression1.js
+++ b/tests/baselines/reference/classExpression1.js
@@ -6,4 +6,4 @@ var v = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classExpression2.js b/tests/baselines/reference/classExpression2.js
index f74bb8bd5e24a..ed9497c8729c0 100644
--- a/tests/baselines/reference/classExpression2.js
+++ b/tests/baselines/reference/classExpression2.js
@@ -12,11 +12,11 @@ var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var v = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(D);
+}(D));
diff --git a/tests/baselines/reference/classExpression3.js b/tests/baselines/reference/classExpression3.js
index ec9581eaf396c..508dc039387e9 100644
--- a/tests/baselines/reference/classExpression3.js
+++ b/tests/baselines/reference/classExpression3.js
@@ -19,19 +19,19 @@ var C = (function (_super) {
         this.c = 3;
     }
     return class_1;
-})((function (_super) {
+}((function (_super) {
     __extends(class_2, _super);
     function class_2() {
         _super.apply(this, arguments);
         this.b = 2;
     }
     return class_2;
-})((function () {
+}((function () {
     function class_3() {
         this.a = 1;
     }
     return class_3;
-})()));
+}())))));
 var c = new C();
 c.a;
 c.b;
diff --git a/tests/baselines/reference/classExpression4.js b/tests/baselines/reference/classExpression4.js
index c2ead0474e25b..7bdc8bd06ef64 100644
--- a/tests/baselines/reference/classExpression4.js
+++ b/tests/baselines/reference/classExpression4.js
@@ -15,5 +15,5 @@ var C = (function () {
         return new C();
     };
     return class_1;
-})();
+}());
 var x = (new C).foo();
diff --git a/tests/baselines/reference/classExpressionExtendingAbstractClass.js b/tests/baselines/reference/classExpressionExtendingAbstractClass.js
index a5149538da229..c4da02cb3219d 100644
--- a/tests/baselines/reference/classExpressionExtendingAbstractClass.js
+++ b/tests/baselines/reference/classExpressionExtendingAbstractClass.js
@@ -18,11 +18,11 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var C = (function (_super) {
     __extends(class_1, _super);
     function class_1() {
         _super.apply(this, arguments);
     }
     return class_1;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/classExpressionTest1.js b/tests/baselines/reference/classExpressionTest1.js
index e91cdebb8c1a6..6b799c12f0413 100644
--- a/tests/baselines/reference/classExpressionTest1.js
+++ b/tests/baselines/reference/classExpressionTest1.js
@@ -23,7 +23,7 @@ function M() {
             return { t: t, x: x };
         };
         return C;
-    })();
+    }());
     var v = new C();
     return v.f();
 }
diff --git a/tests/baselines/reference/classExpressionTest2.js b/tests/baselines/reference/classExpressionTest2.js
index ebb5c1e21b641..761af899759dd 100644
--- a/tests/baselines/reference/classExpressionTest2.js
+++ b/tests/baselines/reference/classExpressionTest2.js
@@ -23,7 +23,7 @@ function M() {
             return { t: t, x: x };
         };
         return C;
-    })();
+    }());
     var v = new m();
     return v.f();
 }
diff --git a/tests/baselines/reference/classExpressionWithDecorator1.js b/tests/baselines/reference/classExpressionWithDecorator1.js
index 8494ec32cda3c..e051e05251bb6 100644
--- a/tests/baselines/reference/classExpressionWithDecorator1.js
+++ b/tests/baselines/reference/classExpressionWithDecorator1.js
@@ -17,5 +17,5 @@ var C = (function () {
         decorate
     ], C);
     return C;
-})();
+}());
 ;
diff --git a/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.js b/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.js
index 7c9f25cdfe646..e13e0de6b78b6 100644
--- a/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.js
+++ b/tests/baselines/reference/classExpressionWithResolutionOfNamespaceOfSameName01.js
@@ -13,4 +13,4 @@ var x = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties1.js b/tests/baselines/reference/classExpressionWithStaticProperties1.js
index 344dbff50ed61..cfe85d97a7184 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties1.js
+++ b/tests/baselines/reference/classExpressionWithStaticProperties1.js
@@ -8,4 +8,4 @@ var v = (function () {
     C.a = 1;
     C.b = 2;
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties2.js b/tests/baselines/reference/classExpressionWithStaticProperties2.js
index 9ff9c06ffe4fe..134441e0ad950 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties2.js
+++ b/tests/baselines/reference/classExpressionWithStaticProperties2.js
@@ -7,4 +7,4 @@ var v = (function () {
     }
     C.a = 1;
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classExtendingBuiltinType.js b/tests/baselines/reference/classExtendingBuiltinType.js
index 8a4b0dd38491a..ace4cf19feef9 100644
--- a/tests/baselines/reference/classExtendingBuiltinType.js
+++ b/tests/baselines/reference/classExtendingBuiltinType.js
@@ -23,67 +23,67 @@ var C1 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C1;
-})(Object);
+}(Object));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(Function);
+}(Function));
 var C3 = (function (_super) {
     __extends(C3, _super);
     function C3() {
         _super.apply(this, arguments);
     }
     return C3;
-})(String);
+}(String));
 var C4 = (function (_super) {
     __extends(C4, _super);
     function C4() {
         _super.apply(this, arguments);
     }
     return C4;
-})(Boolean);
+}(Boolean));
 var C5 = (function (_super) {
     __extends(C5, _super);
     function C5() {
         _super.apply(this, arguments);
     }
     return C5;
-})(Number);
+}(Number));
 var C6 = (function (_super) {
     __extends(C6, _super);
     function C6() {
         _super.apply(this, arguments);
     }
     return C6;
-})(Date);
+}(Date));
 var C7 = (function (_super) {
     __extends(C7, _super);
     function C7() {
         _super.apply(this, arguments);
     }
     return C7;
-})(RegExp);
+}(RegExp));
 var C8 = (function (_super) {
     __extends(C8, _super);
     function C8() {
         _super.apply(this, arguments);
     }
     return C8;
-})(Error);
+}(Error));
 var C9 = (function (_super) {
     __extends(C9, _super);
     function C9() {
         _super.apply(this, arguments);
     }
     return C9;
-})(Array);
+}(Array));
 var C10 = (function (_super) {
     __extends(C10, _super);
     function C10() {
         _super.apply(this, arguments);
     }
     return C10;
-})(Array);
+}(Array));
diff --git a/tests/baselines/reference/classExtendingClass.js b/tests/baselines/reference/classExtendingClass.js
index 6168cb3418de4..8073271b5eac1 100644
--- a/tests/baselines/reference/classExtendingClass.js
+++ b/tests/baselines/reference/classExtendingClass.js
@@ -43,14 +43,14 @@ var C = (function () {
     C.prototype.thing = function () { };
     C.other = function () { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 var d;
 var r = d.foo;
 var r2 = d.bar;
@@ -62,14 +62,14 @@ var C2 = (function () {
     C2.prototype.thing = function (x) { };
     C2.other = function (x) { };
     return C2;
-})();
+}());
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
         _super.apply(this, arguments);
     }
     return D2;
-})(C2);
+}(C2));
 var d2;
 var r5 = d2.foo;
 var r6 = d2.bar;
diff --git a/tests/baselines/reference/classExtendingClassLikeType.js b/tests/baselines/reference/classExtendingClassLikeType.js
index 4634b22e493ad..a41bb14451aad 100644
--- a/tests/baselines/reference/classExtendingClassLikeType.js
+++ b/tests/baselines/reference/classExtendingClassLikeType.js
@@ -71,7 +71,7 @@ var D0 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D0;
-})(Base);
+}(Base));
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
@@ -80,7 +80,7 @@ var D1 = (function (_super) {
         this.y = "y";
     }
     return D1;
-})(getBase());
+}(getBase()));
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
@@ -90,7 +90,7 @@ var D2 = (function (_super) {
         this.y = 2;
     }
     return D2;
-})(getBase());
+}(getBase()));
 var D3 = (function (_super) {
     __extends(D3, _super);
     function D3() {
@@ -99,7 +99,7 @@ var D3 = (function (_super) {
         this.y = 2;
     }
     return D3;
-})(getBase());
+}(getBase()));
 // Error, no constructors with three type arguments
 var D4 = (function (_super) {
     __extends(D4, _super);
@@ -107,7 +107,7 @@ var D4 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D4;
-})(getBase());
+}(getBase()));
 // Error, constructor return types differ
 var D5 = (function (_super) {
     __extends(D5, _super);
@@ -115,4 +115,4 @@ var D5 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D5;
-})(getBadBase());
+}(getBadBase()));
diff --git a/tests/baselines/reference/classExtendingNonConstructor.js b/tests/baselines/reference/classExtendingNonConstructor.js
index dff2fdf9ca9dd..c46e3c5ddbe85 100644
--- a/tests/baselines/reference/classExtendingNonConstructor.js
+++ b/tests/baselines/reference/classExtendingNonConstructor.js
@@ -30,46 +30,46 @@ var C1 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C1;
-})(undefined);
+}(undefined));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(true);
+}(true));
 var C3 = (function (_super) {
     __extends(C3, _super);
     function C3() {
         _super.apply(this, arguments);
     }
     return C3;
-})(false);
+}(false));
 var C4 = (function (_super) {
     __extends(C4, _super);
     function C4() {
         _super.apply(this, arguments);
     }
     return C4;
-})(42);
+}(42));
 var C5 = (function (_super) {
     __extends(C5, _super);
     function C5() {
         _super.apply(this, arguments);
     }
     return C5;
-})("hello");
+}("hello"));
 var C6 = (function (_super) {
     __extends(C6, _super);
     function C6() {
         _super.apply(this, arguments);
     }
     return C6;
-})(x);
+}(x));
 var C7 = (function (_super) {
     __extends(C7, _super);
     function C7() {
         _super.apply(this, arguments);
     }
     return C7;
-})(foo);
+}(foo));
diff --git a/tests/baselines/reference/classExtendingNull.js b/tests/baselines/reference/classExtendingNull.js
index ac8009b9cd97d..fa6f0357b0dc1 100644
--- a/tests/baselines/reference/classExtendingNull.js
+++ b/tests/baselines/reference/classExtendingNull.js
@@ -15,11 +15,11 @@ var C1 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C1;
-})(null);
+}(null));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})((null));
+}((null)));
diff --git a/tests/baselines/reference/classExtendingPrimitive.js b/tests/baselines/reference/classExtendingPrimitive.js
index cafa4eebcd11f..8ecad9c24a57c 100644
--- a/tests/baselines/reference/classExtendingPrimitive.js
+++ b/tests/baselines/reference/classExtendingPrimitive.js
@@ -27,33 +27,33 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(number);
+}(number));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(string);
+}(string));
 var C3 = (function (_super) {
     __extends(C3, _super);
     function C3() {
         _super.apply(this, arguments);
     }
     return C3;
-})(boolean);
+}(boolean));
 var C4 = (function (_super) {
     __extends(C4, _super);
     function C4() {
         _super.apply(this, arguments);
     }
     return C4;
-})(Void);
+}(Void));
 var C4a = (function () {
     function C4a() {
     }
     return C4a;
-})();
+}());
 void {};
 var C5 = (function (_super) {
     __extends(C5, _super);
@@ -61,28 +61,28 @@ var C5 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C5;
-})(Null);
+}(Null));
 var C5a = (function (_super) {
     __extends(C5a, _super);
     function C5a() {
         _super.apply(this, arguments);
     }
     return C5a;
-})(null);
+}(null));
 var C6 = (function (_super) {
     __extends(C6, _super);
     function C6() {
         _super.apply(this, arguments);
     }
     return C6;
-})(undefined);
+}(undefined));
 var C7 = (function (_super) {
     __extends(C7, _super);
     function C7() {
         _super.apply(this, arguments);
     }
     return C7;
-})(Undefined);
+}(Undefined));
 var E;
 (function (E) {
     E[E["A"] = 0] = "A";
@@ -93,4 +93,4 @@ var C8 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C8;
-})(E);
+}(E));
diff --git a/tests/baselines/reference/classExtendingPrimitive2.js b/tests/baselines/reference/classExtendingPrimitive2.js
index 4661ab961c9b5..af76697796741 100644
--- a/tests/baselines/reference/classExtendingPrimitive2.js
+++ b/tests/baselines/reference/classExtendingPrimitive2.js
@@ -15,7 +15,7 @@ var C4a = (function () {
     function C4a() {
     }
     return C4a;
-})();
+}());
 void {};
 var C5a = (function (_super) {
     __extends(C5a, _super);
@@ -23,4 +23,4 @@ var C5a = (function (_super) {
         _super.apply(this, arguments);
     }
     return C5a;
-})(null);
+}(null));
diff --git a/tests/baselines/reference/classExtendingQualifiedName.js b/tests/baselines/reference/classExtendingQualifiedName.js
index 44a4fbe2bd645..17d888834ec10 100644
--- a/tests/baselines/reference/classExtendingQualifiedName.js
+++ b/tests/baselines/reference/classExtendingQualifiedName.js
@@ -19,12 +19,12 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     var D = (function (_super) {
         __extends(D, _super);
         function D() {
             _super.apply(this, arguments);
         }
         return D;
-    })(M.C);
+    }(M.C));
 })(M || (M = {}));
diff --git a/tests/baselines/reference/classExtendingQualifiedName2.js b/tests/baselines/reference/classExtendingQualifiedName2.js
index afd432180d42b..4f1d872e75339 100644
--- a/tests/baselines/reference/classExtendingQualifiedName2.js
+++ b/tests/baselines/reference/classExtendingQualifiedName2.js
@@ -19,7 +19,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
     var D = (function (_super) {
         __extends(D, _super);
@@ -27,5 +27,5 @@ var M;
             _super.apply(this, arguments);
         }
         return D;
-    })(M.C);
+    }(M.C));
 })(M || (M = {}));
diff --git a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
index fe8dc79b864e1..80b4b7c175d56 100644
--- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
@@ -23,7 +23,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var A;
 (function (A) {
 })(A || (A = {}));
@@ -36,5 +36,5 @@ var Foo;
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
 })(Foo || (Foo = {}));
diff --git a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
index 94c5067915111..4c593761f0099 100644
--- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
@@ -16,7 +16,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var Foo;
 (function (Foo) {
     var A = 1;
@@ -26,5 +26,5 @@ var Foo;
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
 })(Foo || (Foo = {}));
diff --git a/tests/baselines/reference/classExtendsEveryObjectType.js b/tests/baselines/reference/classExtendsEveryObjectType.js
index 92414c7e6c395..8b4663ad2cb31 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType.js
@@ -28,14 +28,14 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(I); // error
+}(I)); // error
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})({ foo: string }); // error
+}({ foo: string })); // error
 var x;
 var C3 = (function (_super) {
     __extends(C3, _super);
@@ -43,7 +43,7 @@ var C3 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C3;
-})(x); // error
+}(x)); // error
 var M;
 (function (M) {
     M.x = 1;
@@ -54,7 +54,7 @@ var C4 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C4;
-})(M); // error
+}(M)); // error
 function foo() { }
 var C5 = (function (_super) {
     __extends(C5, _super);
@@ -62,11 +62,11 @@ var C5 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C5;
-})(foo); // error
+}(foo)); // error
 var C6 = (function (_super) {
     __extends(C6, _super);
     function C6() {
         _super.apply(this, arguments);
     }
     return C6;
-})([]); // error
+}([])); // error
diff --git a/tests/baselines/reference/classExtendsEveryObjectType2.js b/tests/baselines/reference/classExtendsEveryObjectType2.js
index 2735032f3c4cf..6aceb0ffebf2a 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType2.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType2.js
@@ -15,11 +15,11 @@ var C2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C2;
-})({ foo: string }); // error
+}({ foo: string })); // error
 var C6 = (function (_super) {
     __extends(C6, _super);
     function C6() {
         _super.apply(this, arguments);
     }
     return C6;
-})([]); // error
+}([])); // error
diff --git a/tests/baselines/reference/classExtendsInterface.js b/tests/baselines/reference/classExtendsInterface.js
index 9b78cde35e9a5..c06c4e66d8b69 100644
--- a/tests/baselines/reference/classExtendsInterface.js
+++ b/tests/baselines/reference/classExtendsInterface.js
@@ -20,21 +20,21 @@ var A = (function (_super) {
         _super.apply(this, arguments);
     }
     return A;
-})(Comparable);
+}(Comparable));
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var A2 = (function (_super) {
     __extends(A2, _super);
     function A2() {
         _super.apply(this, arguments);
     }
     return A2;
-})(Comparable2);
+}(Comparable2));
 var B2 = (function () {
     function B2() {
     }
     return B2;
-})();
+}());
diff --git a/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js b/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js
index 907b6bd6fd2e2..aab40d145c4d9 100644
--- a/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js
+++ b/tests/baselines/reference/classExtendsInterfaceThatExtendsClassWithPrivates1.js
@@ -21,7 +21,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { return x; };
     return C;
-})();
+}());
 var D2 = (function () {
     function D2() {
         this.x = 3;
@@ -29,4 +29,4 @@ var D2 = (function () {
     D2.prototype.foo = function (x) { return x; };
     D2.prototype.other = function (x) { return x; };
     return D2;
-})();
+}());
diff --git a/tests/baselines/reference/classExtendsItself.js b/tests/baselines/reference/classExtendsItself.js
index c370e797a57f7..279d0ad6899da 100644
--- a/tests/baselines/reference/classExtendsItself.js
+++ b/tests/baselines/reference/classExtendsItself.js
@@ -17,18 +17,18 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(C); // error
+}(C)); // error
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(D); // error
+}(D)); // error
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
         _super.apply(this, arguments);
     }
     return E;
-})(E); // error
+}(E)); // error
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly.js b/tests/baselines/reference/classExtendsItselfIndirectly.js
index 65cd72ce3c859..f8ea40ee69ccc 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly.js
@@ -23,39 +23,39 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(E); // error
+}(E)); // error
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
         _super.apply(this, arguments);
     }
     return E;
-})(D);
+}(D));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(E2); // error
+}(E2)); // error
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
         _super.apply(this, arguments);
     }
     return D2;
-})(C2);
+}(C2));
 var E2 = (function (_super) {
     __extends(E2, _super);
     function E2() {
         _super.apply(this, arguments);
     }
     return E2;
-})(D2);
+}(D2));
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly2.js b/tests/baselines/reference/classExtendsItselfIndirectly2.js
index c0b46e6cbb63b..269edb851e9fd 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly2.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly2.js
@@ -34,7 +34,7 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(N.E); // error
+}(N.E)); // error
 var M;
 (function (M) {
     var D = (function (_super) {
@@ -43,7 +43,7 @@ var M;
             _super.apply(this, arguments);
         }
         return D;
-    })(C);
+    }(C));
     M.D = D;
 })(M || (M = {}));
 var N;
@@ -54,7 +54,7 @@ var N;
             _super.apply(this, arguments);
         }
         return E;
-    })(M.D);
+    }(M.D));
     N.E = E;
 })(N || (N = {}));
 var O;
@@ -65,7 +65,7 @@ var O;
             _super.apply(this, arguments);
         }
         return C2;
-    })(Q.E2); // error
+    }(Q.E2)); // error
     var P;
     (function (P) {
         var D2 = (function (_super) {
@@ -74,7 +74,7 @@ var O;
                 _super.apply(this, arguments);
             }
             return D2;
-        })(C2);
+        }(C2));
         P.D2 = D2;
     })(P || (P = {}));
     var Q;
@@ -85,7 +85,7 @@ var O;
                 _super.apply(this, arguments);
             }
             return E2;
-        })(P.D2);
+        }(P.D2));
         Q.E2 = E2;
     })(Q || (Q = {}));
 })(O || (O = {}));
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly3.js b/tests/baselines/reference/classExtendsItselfIndirectly3.js
index 9241403a7cef2..2d2cf938156fb 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly3.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly3.js
@@ -30,7 +30,7 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(E); // error
+}(E)); // error
 //// [classExtendsItselfIndirectly_file2.js]
 var __extends = (this && this.__extends) || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
@@ -43,7 +43,7 @@ var D = (function (_super) {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 //// [classExtendsItselfIndirectly_file3.js]
 var __extends = (this && this.__extends) || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
@@ -56,7 +56,7 @@ var E = (function (_super) {
         _super.apply(this, arguments);
     }
     return E;
-})(D);
+}(D));
 //// [classExtendsItselfIndirectly_file4.js]
 var __extends = (this && this.__extends) || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
@@ -69,7 +69,7 @@ var C2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C2;
-})(E2); // error
+}(E2)); // error
 //// [classExtendsItselfIndirectly_file5.js]
 var __extends = (this && this.__extends) || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
@@ -82,7 +82,7 @@ var D2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D2;
-})(C2);
+}(C2));
 //// [classExtendsItselfIndirectly_file6.js]
 var __extends = (this && this.__extends) || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
@@ -95,4 +95,4 @@ var E2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return E2;
-})(D2);
+}(D2));
diff --git a/tests/baselines/reference/classExtendsMultipleBaseClasses.js b/tests/baselines/reference/classExtendsMultipleBaseClasses.js
index d1ffee30415e8..61db0a41a5ca2 100644
--- a/tests/baselines/reference/classExtendsMultipleBaseClasses.js
+++ b/tests/baselines/reference/classExtendsMultipleBaseClasses.js
@@ -13,16 +13,16 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/classExtendsNull.js b/tests/baselines/reference/classExtendsNull.js
index 5627f10dca6bc..afb2be21c686f 100644
--- a/tests/baselines/reference/classExtendsNull.js
+++ b/tests/baselines/reference/classExtendsNull.js
@@ -25,11 +25,11 @@ var C = (function (_super) {
         return Object.create(null);
     }
     return C;
-})(null);
+}(null));
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         return Object.create(null);
     }
     return D;
-})(null);
+}(null));
diff --git a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
index 164ffdc8493ac..ae2f73cadc182 100644
--- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
@@ -18,7 +18,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var M;
 (function (M) {
     var C = 1;
@@ -28,5 +28,5 @@ var M;
             _super.apply(this, arguments);
         }
         return D;
-    })(C);
+    }(C));
 })(M || (M = {}));
diff --git a/tests/baselines/reference/classExtendsValidConstructorFunction.js b/tests/baselines/reference/classExtendsValidConstructorFunction.js
index 448db68db9fd2..00cd35693f132 100644
--- a/tests/baselines/reference/classExtendsValidConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsValidConstructorFunction.js
@@ -19,4 +19,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(foo); // error, cannot extend it though
+}(foo)); // error, cannot extend it though
diff --git a/tests/baselines/reference/classHeritageWithTrailingSeparator.js b/tests/baselines/reference/classHeritageWithTrailingSeparator.js
index 2d5b12d5201f1..7f85e4e25d731 100644
--- a/tests/baselines/reference/classHeritageWithTrailingSeparator.js
+++ b/tests/baselines/reference/classHeritageWithTrailingSeparator.js
@@ -13,11 +13,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/classImplementingInterfaceIndexer.js b/tests/baselines/reference/classImplementingInterfaceIndexer.js
index dffd9063e8794..532ac93d17ed7 100644
--- a/tests/baselines/reference/classImplementingInterfaceIndexer.js
+++ b/tests/baselines/reference/classImplementingInterfaceIndexer.js
@@ -11,4 +11,4 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/classImplementsClass1.js b/tests/baselines/reference/classImplementsClass1.js
index 8a0be66cda65f..847dc5ba53175 100644
--- a/tests/baselines/reference/classImplementsClass1.js
+++ b/tests/baselines/reference/classImplementsClass1.js
@@ -7,9 +7,9 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classImplementsClass2.js b/tests/baselines/reference/classImplementsClass2.js
index 490d2706b4846..09cdd5c779bb2 100644
--- a/tests/baselines/reference/classImplementsClass2.js
+++ b/tests/baselines/reference/classImplementsClass2.js
@@ -24,12 +24,12 @@ var A = (function () {
     }
     A.prototype.foo = function () { return 1; };
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})(); // error
+}()); // error
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
@@ -39,7 +39,7 @@ var C2 = (function (_super) {
         return 1;
     };
     return C2;
-})(A);
+}(A));
 var c;
 var c2;
 c = c2;
diff --git a/tests/baselines/reference/classImplementsClass3.js b/tests/baselines/reference/classImplementsClass3.js
index 00cb49e2da328..b47514b1286be 100644
--- a/tests/baselines/reference/classImplementsClass3.js
+++ b/tests/baselines/reference/classImplementsClass3.js
@@ -25,7 +25,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { return 1; };
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -33,14 +33,14 @@ var C = (function () {
         return 1;
     };
     return C;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(A);
+}(A));
 // no errors
 var c;
 var c2;
diff --git a/tests/baselines/reference/classImplementsClass4.js b/tests/baselines/reference/classImplementsClass4.js
index 0d7508b723bab..32ae1ef3e8824 100644
--- a/tests/baselines/reference/classImplementsClass4.js
+++ b/tests/baselines/reference/classImplementsClass4.js
@@ -28,7 +28,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { return 1; };
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -36,14 +36,14 @@ var C = (function () {
         return 1;
     };
     return C;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(A);
+}(A));
 var c;
 var c2;
 c = c2;
diff --git a/tests/baselines/reference/classImplementsClass5.js b/tests/baselines/reference/classImplementsClass5.js
index caacb7b304486..923ac9c98299d 100644
--- a/tests/baselines/reference/classImplementsClass5.js
+++ b/tests/baselines/reference/classImplementsClass5.js
@@ -29,7 +29,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { return 1; };
     return A;
-})();
+}());
 var C = (function () {
     function C() {
         this.x = 1;
@@ -38,14 +38,14 @@ var C = (function () {
         return 1;
     };
     return C;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(A);
+}(A));
 var c;
 var c2;
 c = c2;
diff --git a/tests/baselines/reference/classImplementsClass6.js b/tests/baselines/reference/classImplementsClass6.js
index 2e8d765be896b..a807590749ef5 100644
--- a/tests/baselines/reference/classImplementsClass6.js
+++ b/tests/baselines/reference/classImplementsClass6.js
@@ -35,7 +35,7 @@ var A = (function () {
     };
     A.prototype.foo = function () { return 1; };
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -43,14 +43,14 @@ var C = (function () {
         return 1;
     };
     return C;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(A);
+}(A));
 var c;
 var c2;
 c = c2;
diff --git a/tests/baselines/reference/classImplementsImportedInterface.js b/tests/baselines/reference/classImplementsImportedInterface.js
index a2af2083a2a12..d9d7d9eed2e05 100644
--- a/tests/baselines/reference/classImplementsImportedInterface.js
+++ b/tests/baselines/reference/classImplementsImportedInterface.js
@@ -20,5 +20,5 @@ var M2;
         }
         C.prototype.foo = function () { };
         return C;
-    })();
+    }());
 })(M2 || (M2 = {}));
diff --git a/tests/baselines/reference/classImplementsMergedClassInterface.js b/tests/baselines/reference/classImplementsMergedClassInterface.js
index 64a0198cc1627..67381a024672b 100644
--- a/tests/baselines/reference/classImplementsMergedClassInterface.js
+++ b/tests/baselines/reference/classImplementsMergedClassInterface.js
@@ -28,19 +28,19 @@ var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
     }
     return C4;
-})();
+}());
 var C5 = (function () {
     function C5() {
     }
     return C5;
-})();
+}());
diff --git a/tests/baselines/reference/classIndexer.js b/tests/baselines/reference/classIndexer.js
index bed13e3f43147..dfdc6274511c5 100644
--- a/tests/baselines/reference/classIndexer.js
+++ b/tests/baselines/reference/classIndexer.js
@@ -10,4 +10,4 @@ var C123 = (function () {
     function C123() {
     }
     return C123;
-})();
+}());
diff --git a/tests/baselines/reference/classIndexer2.js b/tests/baselines/reference/classIndexer2.js
index 6ed7098e7553b..eb83ba397dcc4 100644
--- a/tests/baselines/reference/classIndexer2.js
+++ b/tests/baselines/reference/classIndexer2.js
@@ -12,4 +12,4 @@ var C123 = (function () {
     function C123() {
     }
     return C123;
-})();
+}());
diff --git a/tests/baselines/reference/classIndexer3.js b/tests/baselines/reference/classIndexer3.js
index e962c7295f242..39fb844613e93 100644
--- a/tests/baselines/reference/classIndexer3.js
+++ b/tests/baselines/reference/classIndexer3.js
@@ -20,11 +20,11 @@ var C123 = (function () {
     function C123() {
     }
     return C123;
-})();
+}());
 var D123 = (function (_super) {
     __extends(D123, _super);
     function D123() {
         _super.apply(this, arguments);
     }
     return D123;
-})(C123);
+}(C123));
diff --git a/tests/baselines/reference/classIndexer4.js b/tests/baselines/reference/classIndexer4.js
index 419f785f26e38..f5258d8b5e1de 100644
--- a/tests/baselines/reference/classIndexer4.js
+++ b/tests/baselines/reference/classIndexer4.js
@@ -15,4 +15,4 @@ var C123 = (function () {
     function C123() {
     }
     return C123;
-})();
+}());
diff --git a/tests/baselines/reference/classInheritence.js b/tests/baselines/reference/classInheritence.js
index 1e463dd195d93..e6e7a1eaf427b 100644
--- a/tests/baselines/reference/classInheritence.js
+++ b/tests/baselines/reference/classInheritence.js
@@ -14,11 +14,11 @@ var B = (function (_super) {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var A = (function (_super) {
     __extends(A, _super);
     function A() {
         _super.apply(this, arguments);
     }
     return A;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/classInsideBlock.js b/tests/baselines/reference/classInsideBlock.js
index 55b3b0bbead2e..e21695b974566 100644
--- a/tests/baselines/reference/classInsideBlock.js
+++ b/tests/baselines/reference/classInsideBlock.js
@@ -9,5 +9,5 @@ function foo() {
         function C() {
         }
         return C;
-    })();
+    }());
 }
diff --git a/tests/baselines/reference/classIsSubtypeOfBaseType.js b/tests/baselines/reference/classIsSubtypeOfBaseType.js
index a92cfb430bf15..b51488dbe1e2d 100644
--- a/tests/baselines/reference/classIsSubtypeOfBaseType.js
+++ b/tests/baselines/reference/classIsSubtypeOfBaseType.js
@@ -25,18 +25,18 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/classMemberInitializerScoping.js b/tests/baselines/reference/classMemberInitializerScoping.js
index db8d6a1beded1..8f78cfb9ac686 100644
--- a/tests/baselines/reference/classMemberInitializerScoping.js
+++ b/tests/baselines/reference/classMemberInitializerScoping.js
@@ -29,7 +29,7 @@ var CCC = (function () {
     }
     CCC.staticY = aaa; // This shouldnt be error
     return CCC;
-})();
+}());
 // above is equivalent to this:
 var aaaa = 1;
 var CCCC = (function () {
@@ -38,4 +38,4 @@ var CCCC = (function () {
         this.y = '';
     }
     return CCCC;
-})();
+}());
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js
index a431f6aceb8d6..752220a4cbc5c 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping.js
@@ -45,7 +45,7 @@ var Test = (function () {
         console.log(field); // Using field here shouldnt be error
     };
     return Test;
-})();
+}());
 var field1;
 var Test1 = (function () {
     function Test1(field1) {
@@ -60,4 +60,4 @@ var Test1 = (function () {
         console.log(field1); // This shouldnt be error as its a static property
     };
     return Test1;
-})();
+}());
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js
index 8509d60de7c83..4cfee11b57df0 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping2.js
@@ -30,4 +30,4 @@ var Test1 = (function () {
         };
     }
     return Test1;
-})();
+}());
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
index ae6bd9fe73040..d310ccd53bc8f 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
@@ -31,5 +31,5 @@ var Test1 = (function () {
         };
     }
     return Test1;
-})();
+}());
 exports.Test1 = Test1;
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
index a88e2e98a43f6..161bceca04d0a 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
@@ -27,5 +27,5 @@ var Test1 = (function () {
         };
     }
     return Test1;
-})();
+}());
 exports.Test1 = Test1;
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js
index 3e7649210ba36..8af2b70227149 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.js
@@ -19,4 +19,4 @@ var Greeter = (function () {
         };
     }
     return Greeter;
-})();
+}());
diff --git a/tests/baselines/reference/classMemberWithMissingIdentifier.js b/tests/baselines/reference/classMemberWithMissingIdentifier.js
index cd1825d0da01c..a7f1e6ffe4f8b 100644
--- a/tests/baselines/reference/classMemberWithMissingIdentifier.js
+++ b/tests/baselines/reference/classMemberWithMissingIdentifier.js
@@ -9,4 +9,4 @@ var C = (function () {
         this. = {};
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classMemberWithMissingIdentifier2.js b/tests/baselines/reference/classMemberWithMissingIdentifier2.js
index e8494755b2268..6d364369335f1 100644
--- a/tests/baselines/reference/classMemberWithMissingIdentifier2.js
+++ b/tests/baselines/reference/classMemberWithMissingIdentifier2.js
@@ -10,4 +10,4 @@ var C = (function () {
         var _a;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classMethodWithKeywordName1.js b/tests/baselines/reference/classMethodWithKeywordName1.js
index ba5bb72632a1b..6e1faee005cc0 100644
--- a/tests/baselines/reference/classMethodWithKeywordName1.js
+++ b/tests/baselines/reference/classMethodWithKeywordName1.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.try = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classOrder1.js b/tests/baselines/reference/classOrder1.js
index 68bf1cd2a459c..0d6d47891ea60 100644
--- a/tests/baselines/reference/classOrder1.js
+++ b/tests/baselines/reference/classOrder1.js
@@ -19,6 +19,6 @@ var A = (function () {
         /*WScript.Echo("Here!");*/
     };
     return A;
-})();
+}());
 var a = new A();
 a.foo();
diff --git a/tests/baselines/reference/classOrder2.js b/tests/baselines/reference/classOrder2.js
index fd3fee2e03787..ec49320b4be5c 100644
--- a/tests/baselines/reference/classOrder2.js
+++ b/tests/baselines/reference/classOrder2.js
@@ -32,12 +32,12 @@ var A = (function (_super) {
     }
     A.prototype.foo = function () { this.bar(); };
     return A;
-})(B);
+}(B));
 var B = (function () {
     function B() {
     }
     B.prototype.bar = function () { };
     return B;
-})();
+}());
 var a = new A();
 a.foo();
diff --git a/tests/baselines/reference/classOrderBug.js b/tests/baselines/reference/classOrderBug.js
index bc3f0e739c4fe..d937197fad534 100644
--- a/tests/baselines/reference/classOrderBug.js
+++ b/tests/baselines/reference/classOrderBug.js
@@ -26,16 +26,16 @@ var bar = (function () {
         this.baz = new foo();
     }
     return bar;
-})();
+}());
 var baz = (function () {
     function baz() {
     }
     return baz;
-})();
+}());
 var foo = (function (_super) {
     __extends(foo, _super);
     function foo() {
         _super.apply(this, arguments);
     }
     return foo;
-})(baz);
+}(baz));
diff --git a/tests/baselines/reference/classOverloadForFunction.js b/tests/baselines/reference/classOverloadForFunction.js
index 40f076b0f2c12..3916289f9a569 100644
--- a/tests/baselines/reference/classOverloadForFunction.js
+++ b/tests/baselines/reference/classOverloadForFunction.js
@@ -8,6 +8,6 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
 ;
 function foo() { }
diff --git a/tests/baselines/reference/classOverloadForFunction2.js b/tests/baselines/reference/classOverloadForFunction2.js
index 13eb0f6c5333c..0571774534db2 100644
--- a/tests/baselines/reference/classOverloadForFunction2.js
+++ b/tests/baselines/reference/classOverloadForFunction2.js
@@ -7,4 +7,4 @@ var bar = (function () {
     function bar() {
     }
     return bar;
-})();
+}());
diff --git a/tests/baselines/reference/classPropertyAsPrivate.js b/tests/baselines/reference/classPropertyAsPrivate.js
index 51d08b48ec5c1..3db4b7acce430 100644
--- a/tests/baselines/reference/classPropertyAsPrivate.js
+++ b/tests/baselines/reference/classPropertyAsPrivate.js
@@ -42,7 +42,7 @@ var C = (function () {
     });
     C.foo = function () { };
     return C;
-})();
+}());
 var c;
 // all errors
 c.x;
diff --git a/tests/baselines/reference/classPropertyAsProtected.js b/tests/baselines/reference/classPropertyAsProtected.js
index 1cd74089816bc..da0e166513529 100644
--- a/tests/baselines/reference/classPropertyAsProtected.js
+++ b/tests/baselines/reference/classPropertyAsProtected.js
@@ -42,7 +42,7 @@ var C = (function () {
     });
     C.foo = function () { };
     return C;
-})();
+}());
 var c;
 // all errors
 c.x;
diff --git a/tests/baselines/reference/classPropertyIsPublicByDefault.js b/tests/baselines/reference/classPropertyIsPublicByDefault.js
index a0b61a089228c..5a5bfa7afe888 100644
--- a/tests/baselines/reference/classPropertyIsPublicByDefault.js
+++ b/tests/baselines/reference/classPropertyIsPublicByDefault.js
@@ -41,7 +41,7 @@ var C = (function () {
     });
     C.foo = function () { };
     return C;
-})();
+}());
 var c;
 c.x;
 c.y;
diff --git a/tests/baselines/reference/classSideInheritance1.js b/tests/baselines/reference/classSideInheritance1.js
index 6d217149b83ae..0e3897a4f466c 100644
--- a/tests/baselines/reference/classSideInheritance1.js
+++ b/tests/baselines/reference/classSideInheritance1.js
@@ -29,14 +29,14 @@ var A = (function () {
     };
     A.prototype.foo = function () { return 1; };
     return A;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(A);
+}(A));
 var a;
 var c;
 a.bar(); // static off an instance - should be an error
diff --git a/tests/baselines/reference/classSideInheritance2.js b/tests/baselines/reference/classSideInheritance2.js
index fb6f0d8cbb928..72fd4af1eedac 100644
--- a/tests/baselines/reference/classSideInheritance2.js
+++ b/tests/baselines/reference/classSideInheritance2.js
@@ -32,7 +32,7 @@ var SubText = (function (_super) {
         _super.call(this);
     }
     return SubText;
-})(TextBase);
+}(TextBase));
 var TextBase = (function () {
     function TextBase() {
     }
@@ -40,4 +40,4 @@ var TextBase = (function () {
         return new SubText(this, span);
     };
     return TextBase;
-})();
+}());
diff --git a/tests/baselines/reference/classSideInheritance3.js b/tests/baselines/reference/classSideInheritance3.js
index 0891a7c9e7469..b708489c518fb 100644
--- a/tests/baselines/reference/classSideInheritance3.js
+++ b/tests/baselines/reference/classSideInheritance3.js
@@ -29,7 +29,7 @@ var A = (function () {
         this.x = x;
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B(x, data) {
@@ -37,14 +37,14 @@ var B = (function (_super) {
         this.data = data;
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C(x) {
         _super.call(this, x);
     }
     return C;
-})(A);
+}(A));
 var r1 = B; // error
 var r2 = B; // error
 var r3 = C; // ok
diff --git a/tests/baselines/reference/classTypeParametersInStatics.js b/tests/baselines/reference/classTypeParametersInStatics.js
index 8790ad9bceb01..e538c5ee2e399 100644
--- a/tests/baselines/reference/classTypeParametersInStatics.js
+++ b/tests/baselines/reference/classTypeParametersInStatics.js
@@ -60,6 +60,6 @@ var Editor;
             return entry;
         };
         return List;
-    })();
+    }());
     Editor.List = List;
 })(Editor || (Editor = {}));
diff --git a/tests/baselines/reference/classUpdateTests.js b/tests/baselines/reference/classUpdateTests.js
index 95db2680a1cfe..581575d0d468b 100644
--- a/tests/baselines/reference/classUpdateTests.js
+++ b/tests/baselines/reference/classUpdateTests.js
@@ -128,14 +128,14 @@ var A = (function () {
         this.p2 = 0;
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
         this.p1 = 0;
         this.p2 = 0;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(p1, p2, p3) {
         if (p1 === void 0) { p1 = 0; }
@@ -145,7 +145,7 @@ var C = (function () {
         this.p2 = p2;
     }
     return C;
-})();
+}());
 //
 // test requirements for super calls
 //
@@ -153,7 +153,7 @@ var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -161,13 +161,13 @@ var E = (function (_super) {
         this.p1 = 0;
     }
     return E;
-})(D);
+}(D));
 var F = (function (_super) {
     __extends(F, _super);
     function F() {
     } // ERROR - super call required
     return F;
-})(E);
+}(E));
 var G = (function (_super) {
     __extends(G, _super);
     function G() {
@@ -175,20 +175,20 @@ var G = (function (_super) {
         this.p1 = 0;
     } // NO ERROR
     return G;
-})(D);
+}(D));
 var H = (function () {
     function H() {
         _super.call(this);
     } // ERROR - no super call allowed
     return H;
-})();
+}());
 var I = (function (_super) {
     __extends(I, _super);
     function I() {
         _super.call(this);
     } // ERROR - no super call allowed
     return I;
-})(Object);
+}(Object));
 var J = (function (_super) {
     __extends(J, _super);
     function J(p1) {
@@ -196,7 +196,7 @@ var J = (function (_super) {
         this.p1 = p1;
     }
     return J;
-})(G);
+}(G));
 var K = (function (_super) {
     __extends(K, _super);
     function K(p1) {
@@ -205,7 +205,7 @@ var K = (function (_super) {
         _super.call(this);
     }
     return K;
-})(G);
+}(G));
 var L = (function (_super) {
     __extends(L, _super);
     function L(p1) {
@@ -213,7 +213,7 @@ var L = (function (_super) {
         this.p1 = p1;
     }
     return L;
-})(G);
+}(G));
 var M = (function (_super) {
     __extends(M, _super);
     function M(p1) {
@@ -222,7 +222,7 @@ var M = (function (_super) {
         _super.call(this);
     }
     return M;
-})(G);
+}(G));
 //
 // test this reference in field initializers
 //
@@ -233,7 +233,7 @@ var N = (function () {
         this.p2 = 0;
     }
     return N;
-})();
+}());
 //
 // test error on property declarations within class constructors
 //
@@ -242,22 +242,22 @@ var O = (function () {
         this.p1 = 0; // ERROR
     }
     return O;
-})();
+}());
 var P = (function () {
     function P() {
         this.p1 = 0; // ERROR
     }
     return P;
-})();
+}());
 var Q = (function () {
     function Q() {
         this.p1 = 0; // ERROR
     }
     return Q;
-})();
+}());
 var R = (function () {
     function R() {
         this.p1 = 0; // ERROR
     }
     return R;
-})();
+}());
diff --git a/tests/baselines/reference/classWithBaseClassButNoConstructor.js b/tests/baselines/reference/classWithBaseClassButNoConstructor.js
index 44e5d39c3766d..e94a47005068c 100644
--- a/tests/baselines/reference/classWithBaseClassButNoConstructor.js
+++ b/tests/baselines/reference/classWithBaseClassButNoConstructor.js
@@ -50,14 +50,14 @@ var Base = (function () {
     function Base(x) {
     }
     return Base;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(Base);
+}(Base));
 var r = C;
 var c = new C(); // error
 var c2 = new C(1); // ok
@@ -65,14 +65,14 @@ var Base2 = (function () {
     function Base2(x) {
     }
     return Base2;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(Base2);
+}(Base2));
 var r2 = D;
 var d = new D(); // error
 var d2 = new D(1); // ok
@@ -83,7 +83,7 @@ var D2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D2;
-})(Base2);
+}(Base2));
 var r3 = D2;
 var d3 = new D(); // error
 var d4 = new D(1); // ok
@@ -93,7 +93,7 @@ var D3 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D3;
-})(Base2);
+}(Base2));
 var r4 = D3;
 var d5 = new D(); // error
 var d6 = new D(1); // ok
diff --git a/tests/baselines/reference/classWithConstructors.js b/tests/baselines/reference/classWithConstructors.js
index a36db6ee745c3..04dcfa2325c20 100644
--- a/tests/baselines/reference/classWithConstructors.js
+++ b/tests/baselines/reference/classWithConstructors.js
@@ -61,14 +61,14 @@ var NonGeneric;
         function C(x) {
         }
         return C;
-    })();
+    }());
     var c = new C(); // error
     var c2 = new C(''); // ok
     var C2 = (function () {
         function C2(x) {
         }
         return C2;
-    })();
+    }());
     var c3 = new C2(); // error
     var c4 = new C2(''); // ok
     var c5 = new C2(1); // ok
@@ -78,7 +78,7 @@ var NonGeneric;
             _super.apply(this, arguments);
         }
         return D;
-    })(C2);
+    }(C2));
     var d = new D(); // error
     var d2 = new D(1); // ok
     var d3 = new D(''); // ok
@@ -89,14 +89,14 @@ var Generics;
         function C(x) {
         }
         return C;
-    })();
+    }());
     var c = new C(); // error
     var c2 = new C(''); // ok
     var C2 = (function () {
         function C2(x) {
         }
         return C2;
-    })();
+    }());
     var c3 = new C2(); // error
     var c4 = new C2(''); // ok
     var c5 = new C2(1, 2); // ok
@@ -106,7 +106,7 @@ var Generics;
             _super.apply(this, arguments);
         }
         return D;
-    })(C2);
+    }(C2));
     var d = new D(); // error
     var d2 = new D(1); // ok
     var d3 = new D(''); // ok
diff --git a/tests/baselines/reference/classWithEmptyBody.js b/tests/baselines/reference/classWithEmptyBody.js
index 16c50ccec770b..73654afc07b54 100644
--- a/tests/baselines/reference/classWithEmptyBody.js
+++ b/tests/baselines/reference/classWithEmptyBody.js
@@ -25,7 +25,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var o = c;
 c = 1;
@@ -36,7 +36,7 @@ var D = (function () {
         return 1;
     }
     return D;
-})();
+}());
 var d;
 var o = d;
 d = 1;
diff --git a/tests/baselines/reference/classWithMultipleBaseClasses.js b/tests/baselines/reference/classWithMultipleBaseClasses.js
index 0e101d61dc982..4f1170f000e75 100644
--- a/tests/baselines/reference/classWithMultipleBaseClasses.js
+++ b/tests/baselines/reference/classWithMultipleBaseClasses.js
@@ -30,17 +30,17 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.bar = function () { };
     return B;
-})();
+}());
 var D = (function () {
     function D() {
     }
     D.prototype.baz = function () { };
     D.prototype.bat = function () { };
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/classWithNoConstructorOrBaseClass.js b/tests/baselines/reference/classWithNoConstructorOrBaseClass.js
index 7898b3217fdb9..908c5c435323d 100644
--- a/tests/baselines/reference/classWithNoConstructorOrBaseClass.js
+++ b/tests/baselines/reference/classWithNoConstructorOrBaseClass.js
@@ -21,14 +21,14 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = new C();
 var r = C;
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var d = new D();
 var d2 = new D();
 var r2 = D;
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js
index 1c07449c99454..c2942b8571f39 100644
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js
@@ -38,7 +38,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var c;
 var i;
 c = i;
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js
index 78e5cb05861fa..b97269527bee3 100644
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js
@@ -40,7 +40,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var c;
 var i;
 c = i;
diff --git a/tests/baselines/reference/classWithOptionalParameter.js b/tests/baselines/reference/classWithOptionalParameter.js
index 2f11f15febe2e..53f6bcedd9966 100644
--- a/tests/baselines/reference/classWithOptionalParameter.js
+++ b/tests/baselines/reference/classWithOptionalParameter.js
@@ -18,10 +18,10 @@ var C = (function () {
     }
     C.prototype.f = function () { };
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     C2.prototype.f = function (x) { };
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js b/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js
index 4ac6548483e1c..1bc9f197450db 100644
--- a/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js
+++ b/tests/baselines/reference/classWithOverloadImplementationOfWrongName.js
@@ -11,4 +11,4 @@ var C = (function () {
     }
     C.prototype.bar = function (x) { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js b/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js
index fd28ae3d9eb09..8e3d9eee62cc7 100644
--- a/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js
+++ b/tests/baselines/reference/classWithOverloadImplementationOfWrongName2.js
@@ -11,4 +11,4 @@ var C = (function () {
     }
     C.prototype.bar = function (x) { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classWithPredefinedTypesAsNames.js b/tests/baselines/reference/classWithPredefinedTypesAsNames.js
index d7c458de41bce..ed2677145fb20 100644
--- a/tests/baselines/reference/classWithPredefinedTypesAsNames.js
+++ b/tests/baselines/reference/classWithPredefinedTypesAsNames.js
@@ -12,19 +12,19 @@ var any = (function () {
     function any() {
     }
     return any;
-})();
+}());
 var number = (function () {
     function number() {
     }
     return number;
-})();
+}());
 var boolean = (function () {
     function boolean() {
     }
     return boolean;
-})();
+}());
 var string = (function () {
     function string() {
     }
     return string;
-})();
+}());
diff --git a/tests/baselines/reference/classWithPredefinedTypesAsNames2.js b/tests/baselines/reference/classWithPredefinedTypesAsNames2.js
index 91ff735acccca..3a788caff8b68 100644
--- a/tests/baselines/reference/classWithPredefinedTypesAsNames2.js
+++ b/tests/baselines/reference/classWithPredefinedTypesAsNames2.js
@@ -9,5 +9,5 @@ var default_1 = (function () {
     function default_1() {
     }
     return default_1;
-})();
+}());
 void {};
diff --git a/tests/baselines/reference/classWithPrivateProperty.js b/tests/baselines/reference/classWithPrivateProperty.js
index 0529fd8d694ff..6e75797523fb3 100644
--- a/tests/baselines/reference/classWithPrivateProperty.js
+++ b/tests/baselines/reference/classWithPrivateProperty.js
@@ -34,7 +34,7 @@ var C = (function () {
     C.f = function () { return ''; };
     C.g = function () { return ''; };
     return C;
-})();
+}());
 var c = new C();
 var r1 = c.x;
 var r2 = c.a;
diff --git a/tests/baselines/reference/classWithProtectedProperty.js b/tests/baselines/reference/classWithProtectedProperty.js
index ec8a203d2005c..75eadaf4010be 100644
--- a/tests/baselines/reference/classWithProtectedProperty.js
+++ b/tests/baselines/reference/classWithProtectedProperty.js
@@ -44,7 +44,7 @@ var C = (function () {
     C.f = function () { return ''; };
     C.g = function () { return ''; };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -63,4 +63,4 @@ var D = (function (_super) {
         var r8 = C.g();
     };
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/classWithPublicProperty.js b/tests/baselines/reference/classWithPublicProperty.js
index cc1b0aad64f58..054713264bd01 100644
--- a/tests/baselines/reference/classWithPublicProperty.js
+++ b/tests/baselines/reference/classWithPublicProperty.js
@@ -32,7 +32,7 @@ var C = (function () {
     C.f = function () { return ''; };
     C.g = function () { return ''; };
     return C;
-})();
+}());
 // all of these are valid
 var c = new C();
 var r1 = c.x;
diff --git a/tests/baselines/reference/classWithSemicolonClassElement1.js b/tests/baselines/reference/classWithSemicolonClassElement1.js
index 3838316e113a8..8eb904ef78636 100644
--- a/tests/baselines/reference/classWithSemicolonClassElement1.js
+++ b/tests/baselines/reference/classWithSemicolonClassElement1.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     ;
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classWithSemicolonClassElement2.js b/tests/baselines/reference/classWithSemicolonClassElement2.js
index 77af51bce6014..22b6fa1075ee0 100644
--- a/tests/baselines/reference/classWithSemicolonClassElement2.js
+++ b/tests/baselines/reference/classWithSemicolonClassElement2.js
@@ -11,4 +11,4 @@ var C = (function () {
     ;
     ;
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/classWithStaticMembers.js b/tests/baselines/reference/classWithStaticMembers.js
index 34928c37abd18..327adead6b89e 100644
--- a/tests/baselines/reference/classWithStaticMembers.js
+++ b/tests/baselines/reference/classWithStaticMembers.js
@@ -38,7 +38,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var r = C.fn();
 var r2 = r.x;
 var r3 = r.foo;
@@ -48,7 +48,7 @@ var D = (function (_super) {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 var r = D.fn();
 var r2 = r.x;
 var r3 = r.foo;
diff --git a/tests/baselines/reference/classWithTwoConstructorDefinitions.js b/tests/baselines/reference/classWithTwoConstructorDefinitions.js
index 31e5498cfc9ac..397a7c8252962 100644
--- a/tests/baselines/reference/classWithTwoConstructorDefinitions.js
+++ b/tests/baselines/reference/classWithTwoConstructorDefinitions.js
@@ -14,9 +14,9 @@ var C = (function () {
     function C() {
     } // error
     return C;
-})();
+}());
 var D = (function () {
     function D(x) {
     } // error
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/classWithoutExplicitConstructor.js b/tests/baselines/reference/classWithoutExplicitConstructor.js
index fed448a24590e..6b835eb35a0cc 100644
--- a/tests/baselines/reference/classWithoutExplicitConstructor.js
+++ b/tests/baselines/reference/classWithoutExplicitConstructor.js
@@ -22,7 +22,7 @@ var C = (function () {
         this.y = 'hello';
     }
     return C;
-})();
+}());
 var c = new C();
 var c2 = new C(null); // error
 var D = (function () {
@@ -31,6 +31,6 @@ var D = (function () {
         this.y = null;
     }
     return D;
-})();
+}());
 var d = new D();
 var d2 = new D(null); // error
diff --git a/tests/baselines/reference/classdecl.js b/tests/baselines/reference/classdecl.js
index b424243c164d5..710c5166d3051 100644
--- a/tests/baselines/reference/classdecl.js
+++ b/tests/baselines/reference/classdecl.js
@@ -132,27 +132,27 @@ var a = (function () {
         return ns.toString();
     };
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
 var m1;
 (function (m1) {
     var b = (function () {
         function b() {
         }
         return b;
-    })();
+    }());
     m1.b = b;
     var d = (function () {
         function d() {
         }
         return d;
-    })();
+    }());
 })(m1 || (m1 = {}));
 var m2;
 (function (m2) {
@@ -164,13 +164,13 @@ var m2;
                 _super.apply(this, arguments);
             }
             return c;
-        })(b);
+        }(b));
         m3.c = c;
         var ib2 = (function () {
             function ib2() {
             }
             return ib2;
-        })();
+        }());
         m3.ib2 = ib2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 || (m2 = {}));
@@ -180,12 +180,12 @@ var c = (function (_super) {
         _super.apply(this, arguments);
     }
     return c;
-})(m1.b);
+}(m1.b));
 var ib2 = (function () {
     function ib2() {
     }
     return ib2;
-})();
+}());
 var d = (function () {
     function d() {
     }
@@ -193,7 +193,7 @@ var d = (function () {
         return ns.toString();
     };
     return d;
-})();
+}());
 var e = (function () {
     function e() {
     }
@@ -201,7 +201,7 @@ var e = (function () {
         return ns.toString();
     };
     return e;
-})();
+}());
 
 
 //// [classdecl.d.ts]
diff --git a/tests/baselines/reference/clinterfaces.js b/tests/baselines/reference/clinterfaces.js
index 26f4efde61c97..ed3ea1f652354 100644
--- a/tests/baselines/reference/clinterfaces.js
+++ b/tests/baselines/reference/clinterfaces.js
@@ -33,21 +33,21 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     var D = (function () {
         function D() {
         }
         return D;
-    })();
+    }());
 })(M || (M = {}));
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 module.exports = Foo;
diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.js b/tests/baselines/reference/cloduleAcrossModuleDefinitions.js
index c877de38a000e..f0f31325aed67 100644
--- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.js
+++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.js
@@ -24,7 +24,7 @@ var A;
         B.prototype.foo = function () { };
         B.bar = function () { };
         return B;
-    })();
+    }());
     A.B = B;
 })(A || (A = {}));
 var A;
diff --git a/tests/baselines/reference/cloduleAndTypeParameters.js b/tests/baselines/reference/cloduleAndTypeParameters.js
index 28d89b59cf2b2..2d47ce1ef7535 100644
--- a/tests/baselines/reference/cloduleAndTypeParameters.js
+++ b/tests/baselines/reference/cloduleAndTypeParameters.js
@@ -18,13 +18,13 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo;
 (function (Foo) {
     var Baz = (function () {
         function Baz() {
         }
         return Baz;
-    })();
+    }());
     Foo.Baz = Baz;
 })(Foo || (Foo = {}));
diff --git a/tests/baselines/reference/cloduleSplitAcrossFiles.js b/tests/baselines/reference/cloduleSplitAcrossFiles.js
index 6bc8cfddb6f58..f509df7e9cea3 100644
--- a/tests/baselines/reference/cloduleSplitAcrossFiles.js
+++ b/tests/baselines/reference/cloduleSplitAcrossFiles.js
@@ -14,7 +14,7 @@ var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 //// [cloduleSplitAcrossFiles_module.js]
 var D;
 (function (D) {
diff --git a/tests/baselines/reference/cloduleStaticMembers.js b/tests/baselines/reference/cloduleStaticMembers.js
index 518ef43fe4045..6095442b6292f 100644
--- a/tests/baselines/reference/cloduleStaticMembers.js
+++ b/tests/baselines/reference/cloduleStaticMembers.js
@@ -19,7 +19,7 @@ var Clod = (function () {
     Clod.x = 10;
     Clod.y = 10;
     return Clod;
-})();
+}());
 var Clod;
 (function (Clod) {
     var p = Clod.x;
diff --git a/tests/baselines/reference/cloduleWithDuplicateMember1.js b/tests/baselines/reference/cloduleWithDuplicateMember1.js
index e3cb8f83fed82..6f4a2809b8e6a 100644
--- a/tests/baselines/reference/cloduleWithDuplicateMember1.js
+++ b/tests/baselines/reference/cloduleWithDuplicateMember1.js
@@ -33,7 +33,7 @@ var C = (function () {
     });
     C.foo = function () { };
     return C;
-})();
+}());
 var C;
 (function (C) {
     C.x = 1;
diff --git a/tests/baselines/reference/cloduleWithDuplicateMember2.js b/tests/baselines/reference/cloduleWithDuplicateMember2.js
index c16c6c9af8a1c..f0e8af0e3d2a3 100644
--- a/tests/baselines/reference/cloduleWithDuplicateMember2.js
+++ b/tests/baselines/reference/cloduleWithDuplicateMember2.js
@@ -26,7 +26,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var C;
 (function (C) {
     C.x = 1;
diff --git a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js
index 601ab0a753669..000409236274e 100644
--- a/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js
+++ b/tests/baselines/reference/cloduleWithPriorInstantiatedModule.js
@@ -26,7 +26,7 @@ var Moclodule = (function () {
     function Moclodule() {
     }
     return Moclodule;
-})();
+}());
 // Instantiated module.
 var Moclodule;
 (function (Moclodule) {
@@ -34,6 +34,6 @@ var Moclodule;
         function Manager() {
         }
         return Manager;
-    })();
+    }());
     Moclodule.Manager = Manager;
 })(Moclodule || (Moclodule = {}));
diff --git a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js
index cf06f1134fbda..ba29858c5dd67 100644
--- a/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js
+++ b/tests/baselines/reference/cloduleWithPriorUninstantiatedModule.js
@@ -20,7 +20,7 @@ var Moclodule = (function () {
     function Moclodule() {
     }
     return Moclodule;
-})();
+}());
 // Instantiated module.
 var Moclodule;
 (function (Moclodule) {
@@ -28,6 +28,6 @@ var Moclodule;
         function Manager() {
         }
         return Manager;
-    })();
+    }());
     Moclodule.Manager = Manager;
 })(Moclodule || (Moclodule = {}));
diff --git a/tests/baselines/reference/cloduleWithRecursiveReference.js b/tests/baselines/reference/cloduleWithRecursiveReference.js
index 1a688712270e1..d07af909cc75c 100644
--- a/tests/baselines/reference/cloduleWithRecursiveReference.js
+++ b/tests/baselines/reference/cloduleWithRecursiveReference.js
@@ -14,7 +14,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
     var C;
     (function (C_1) {
diff --git a/tests/baselines/reference/clodulesDerivedClasses.js b/tests/baselines/reference/clodulesDerivedClasses.js
index 652b3f7bac6ca..7e6f26ad59103 100644
--- a/tests/baselines/reference/clodulesDerivedClasses.js
+++ b/tests/baselines/reference/clodulesDerivedClasses.js
@@ -32,7 +32,7 @@ var Shape = (function () {
     function Shape() {
     }
     return Shape;
-})();
+}());
 var Shape;
 (function (Shape) {
     var Utils;
@@ -47,7 +47,7 @@ var Path = (function (_super) {
         _super.apply(this, arguments);
     }
     return Path;
-})(Shape);
+}(Shape));
 var Path;
 (function (Path) {
     var Utils;
diff --git a/tests/baselines/reference/collisionArgumentsClassConstructor.js b/tests/baselines/reference/collisionArgumentsClassConstructor.js
index ca743777b39d8..570b10d39d379 100644
--- a/tests/baselines/reference/collisionArgumentsClassConstructor.js
+++ b/tests/baselines/reference/collisionArgumentsClassConstructor.js
@@ -97,7 +97,7 @@ var c1 = (function () {
         var arguments; // no error
     }
     return c1;
-})();
+}());
 var c12 = (function () {
     function c12(arguments) {
         var rest = [];
@@ -107,13 +107,13 @@ var c12 = (function () {
         var arguments = 10; // no error
     }
     return c12;
-})();
+}());
 var c1NoError = (function () {
     function c1NoError(arguments) {
         var arguments = 10; // no error
     }
     return c1NoError;
-})();
+}());
 var c2 = (function () {
     function c2() {
         var restParameters = [];
@@ -123,13 +123,13 @@ var c2 = (function () {
         var arguments = 10; // no error
     }
     return c2;
-})();
+}());
 var c2NoError = (function () {
     function c2NoError() {
         var arguments = 10; // no error
     }
     return c2NoError;
-})();
+}());
 var c3 = (function () {
     function c3(arguments) {
         var restParameters = [];
@@ -140,14 +140,14 @@ var c3 = (function () {
         var arguments = 10; // no error
     }
     return c3;
-})();
+}());
 var c3NoError = (function () {
     function c3NoError(arguments) {
         this.arguments = arguments;
         var arguments = 10; // no error
     }
     return c3NoError;
-})();
+}());
 var c5 = (function () {
     function c5(i) {
         var arguments = [];
@@ -157,7 +157,7 @@ var c5 = (function () {
         var arguments; // no error
     }
     return c5;
-})();
+}());
 var c52 = (function () {
     function c52(arguments) {
         var rest = [];
@@ -167,10 +167,10 @@ var c52 = (function () {
         var arguments; // no error
     }
     return c52;
-})();
+}());
 var c5NoError = (function () {
     function c5NoError(arguments) {
         var arguments; // no error
     }
     return c5NoError;
-})();
+}());
diff --git a/tests/baselines/reference/collisionArgumentsClassMethod.js b/tests/baselines/reference/collisionArgumentsClassMethod.js
index 10c9b28854408..a20e0385e6a1c 100644
--- a/tests/baselines/reference/collisionArgumentsClassMethod.js
+++ b/tests/baselines/reference/collisionArgumentsClassMethod.js
@@ -87,7 +87,7 @@ var c1 = (function () {
         var arguments; // no error
     };
     return c1;
-})();
+}());
 var c3 = (function () {
     function c3() {
     }
@@ -102,4 +102,4 @@ var c3 = (function () {
         var arguments = 10; // no error
     };
     return c3;
-})();
+}());
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js
index 8152a9c27215e..fd502b32ccf7d 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithAccessorChildren.js
@@ -60,7 +60,7 @@ var M;
             configurable: true
         });
         return c;
-    })();
+    }());
 })(M || (M = {}));
 var M;
 (function (M_2) {
@@ -76,7 +76,7 @@ var M;
             configurable: true
         });
         return d;
-    })();
+    }());
 })(M || (M = {}));
 var M;
 (function (M) {
@@ -91,7 +91,7 @@ var M;
             configurable: true
         });
         return e;
-    })();
+    }());
 })(M || (M = {}));
 var M;
 (function (M_3) {
@@ -107,7 +107,7 @@ var M;
             configurable: true
         });
         return f;
-    })();
+    }());
 })(M || (M = {}));
 var M;
 (function (M) {
@@ -122,5 +122,5 @@ var M;
             configurable: true
         });
         return e;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js
index 2aa705c914123..24332a84797fc 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.js
@@ -32,7 +32,7 @@ var M;
             if (p === void 0) { p = M_1.x; }
         }
         return c;
-    })();
+    }());
 })(M || (M = {}));
 var M;
 (function (M_2) {
@@ -42,7 +42,7 @@ var M;
             this.M = M;
         }
         return d;
-    })();
+    }());
 })(M || (M = {}));
 var M;
 (function (M_3) {
@@ -52,5 +52,5 @@ var M;
             var p = M_3.x;
         }
         return d2;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js
index 05ae475e7d234..cf0fd765e56d0 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.js
@@ -22,7 +22,7 @@ var m1;
         function m1() {
         }
         return m1;
-    })();
+    }());
     m1_1.m1 = m1;
 })(m1 || (m1 = {}));
 var foo = new m1.m1();
@@ -32,13 +32,13 @@ var m2;
         function m2() {
         }
         return m2;
-    })();
+    }());
     m2_1.m2 = m2;
     var _m2 = (function () {
         function _m2() {
         }
         return _m2;
-    })();
+    }());
     m2_1._m2 = _m2;
 })(m2 || (m2 = {}));
 var foo = new m2.m2();
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js
index d511a86d1fe6b..594a8dc2295cb 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.js
@@ -14,7 +14,7 @@ var m1;
         function m2() {
         }
         return m2;
-    })();
+    }());
     m1.m2 = m2;
 })(m1 || (m1 = {}));
 var foo = new m1.m2();
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js
index 53807f1cabd52..a42b650248376 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.js
@@ -43,7 +43,7 @@ var M;
             if (p === void 0) { p = M_1.x; }
         };
         return c;
-    })();
+    }());
 })(M || (M = {}));
 var M;
 (function (M_2) {
@@ -55,7 +55,7 @@ var M;
             var p = M_2.x;
         };
         return d;
-    })();
+    }());
 })(M || (M = {}));
 var M;
 (function (M_3) {
@@ -68,7 +68,7 @@ var M;
             }
         };
         return e;
-    })();
+    }());
 })(M || (M = {}));
 var M;
 (function (M) {
@@ -78,5 +78,5 @@ var M;
         f.prototype.M = function () {
         };
         return f;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js
index 2862a84406786..6726d32d77d40 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.js
@@ -60,7 +60,7 @@ var M;
             function M() {
             }
             return M;
-        })();
+        }());
         var p = M_2.x;
         var p2 = new M();
     })(m2 || (m2 = {}));
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js
index 710c09e4558ae..eed1095cdc3c1 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.js
@@ -36,7 +36,7 @@ var m1;
         function m1() {
         }
         return m1;
-    })();
+    }());
     m1_1.m1 = m1;
 })(m1 || (m1 = {}));
 var foo = new m1.m1();
@@ -46,7 +46,7 @@ var m1;
         function c1() {
         }
         return c1;
-    })();
+    }());
     m1.c1 = c1;
     var b = new c1();
     var c = new m1.m1();
@@ -58,7 +58,7 @@ var m2;
         function c1() {
         }
         return c1;
-    })();
+    }());
     m2.c1 = c1;
     m2.b10 = 10;
     var x = new c1();
@@ -70,7 +70,7 @@ var m2;
         function m2() {
         }
         return m2;
-    })();
+    }());
     m2_1.m2 = m2;
     var b = new m2();
     var d = m2_1.b10;
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js
index 4b4d6aa7afb1b..ca9420197fb98 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.js
@@ -15,13 +15,13 @@ var m1;
         function m1() {
         }
         return m1;
-    })();
+    }());
     var x = new m1();
     var c1 = (function () {
         function c1() {
         }
         return c1;
-    })();
+    }());
     m1_1.c1 = c1;
 })(m1 || (m1 = {}));
 var foo = new m1.c1();
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js
index 3204a05bc7575..50eff733912b8 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js
+++ b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.js
@@ -16,7 +16,7 @@ var 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄü
         function 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123() {
         }
         return 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123;
-    })();
+    }());
     才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123_1.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123;
 })(才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 || (才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 = {}));
 var x = new 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123();
diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js
index b993f9a23c58e..962df0344ed3b 100644
--- a/tests/baselines/reference/collisionExportsRequireAndClass.js
+++ b/tests/baselines/reference/collisionExportsRequireAndClass.js
@@ -43,13 +43,13 @@ define(["require", "exports"], function (require, exports) {
         function require() {
         }
         return require;
-    })();
+    }());
     exports.require = require;
     var exports = (function () {
         function exports() {
         }
         return exports;
-    })();
+    }());
     exports.exports = exports;
     var m1;
     (function (m1) {
@@ -57,12 +57,12 @@ define(["require", "exports"], function (require, exports) {
             function require() {
             }
             return require;
-        })();
+        }());
         var exports = (function () {
             function exports() {
             }
             return exports;
-        })();
+        }());
     })(m1 || (m1 = {}));
     var m2;
     (function (m2) {
@@ -70,13 +70,13 @@ define(["require", "exports"], function (require, exports) {
             function require() {
             }
             return require;
-        })();
+        }());
         m2.require = require;
         var exports = (function () {
             function exports() {
             }
             return exports;
-        })();
+        }());
         m2.exports = exports;
     })(m2 || (m2 = {}));
 });
@@ -85,24 +85,24 @@ var require = (function () {
     function require() {
     }
     return require;
-})();
+}());
 var exports = (function () {
     function exports() {
     }
     return exports;
-})();
+}());
 var m3;
 (function (m3) {
     var require = (function () {
         function require() {
         }
         return require;
-    })();
+    }());
     var exports = (function () {
         function exports() {
         }
         return exports;
-    })();
+    }());
 })(m3 || (m3 = {}));
 var m4;
 (function (m4) {
@@ -110,12 +110,12 @@ var m4;
         function require() {
         }
         return require;
-    })();
+    }());
     m4.require = require;
     var exports = (function () {
         function exports() {
         }
         return exports;
-    })();
+    }());
     m4.exports = exports;
 })(m4 || (m4 = {}));
diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
index 71432241b00bc..1842e415d8833 100644
--- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
+++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
@@ -31,7 +31,7 @@ define(["require", "exports"], function (require, exports) {
             function c() {
             }
             return c;
-        })();
+        }());
         m.c = c;
     })(m = exports.m || (exports.m = {}));
     var exports = m.c;
diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js
index c6a6e234ee9a8..b90d223660187 100644
--- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js
+++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAliasInGlobalFile.js
@@ -29,7 +29,7 @@ var mOfGloalFile;
         function c() {
         }
         return c;
-    })();
+    }());
     mOfGloalFile.c = c;
 })(mOfGloalFile || (mOfGloalFile = {}));
 var exports = mOfGloalFile.c;
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js
index 3c31c94437025..b29364aebe33c 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.js
@@ -100,7 +100,7 @@ define(["require", "exports"], function (require, exports) {
             function C() {
             }
             return C;
-        })();
+        }());
         require.C = C;
     })(require = exports.require || (exports.require = {}));
     function foo() {
@@ -113,7 +113,7 @@ define(["require", "exports"], function (require, exports) {
             function C() {
             }
             return C;
-        })();
+        }());
         exports.C = C;
     })(exports = exports.exports || (exports.exports = {}));
     function foo2() {
@@ -128,7 +128,7 @@ define(["require", "exports"], function (require, exports) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             require.C = C;
         })(require || (require = {}));
         var exports;
@@ -137,7 +137,7 @@ define(["require", "exports"], function (require, exports) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             exports.C = C;
         })(exports || (exports = {}));
     })(m1 || (m1 = {}));
@@ -149,7 +149,7 @@ define(["require", "exports"], function (require, exports) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             require.C = C;
         })(require = m2.require || (m2.require = {}));
         var exports;
@@ -158,7 +158,7 @@ define(["require", "exports"], function (require, exports) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             exports.C = C;
         })(exports = m2.exports || (m2.exports = {}));
     })(m2 || (m2 = {}));
@@ -170,7 +170,7 @@ var require;
         function C() {
         }
         return C;
-    })();
+    }());
     require.C = C;
 })(require || (require = {}));
 var exports;
@@ -179,7 +179,7 @@ var exports;
         function C() {
         }
         return C;
-    })();
+    }());
     exports.C = C;
 })(exports || (exports = {}));
 var m3;
@@ -190,7 +190,7 @@ var m3;
             function C() {
             }
             return C;
-        })();
+        }());
         require.C = C;
     })(require || (require = {}));
     var exports;
@@ -199,7 +199,7 @@ var m3;
             function C() {
             }
             return C;
-        })();
+        }());
         exports.C = C;
     })(exports || (exports = {}));
 })(m3 || (m3 = {}));
@@ -211,7 +211,7 @@ var m4;
             function C() {
             }
             return C;
-        })();
+        }());
         require.C = C;
     })(require = m4.require || (m4.require = {}));
     var exports;
@@ -220,7 +220,7 @@ var m4;
             function C() {
             }
             return C;
-        })();
+        }());
         exports.C = C;
     })(exports = m4.exports || (m4.exports = {}));
 })(m4 || (m4 = {}));
diff --git a/tests/baselines/reference/collisionRestParameterClassConstructor.js b/tests/baselines/reference/collisionRestParameterClassConstructor.js
index fc6e400668c06..82d2ddc089657 100644
--- a/tests/baselines/reference/collisionRestParameterClassConstructor.js
+++ b/tests/baselines/reference/collisionRestParameterClassConstructor.js
@@ -77,13 +77,13 @@ var c1 = (function () {
         var _i = 10; // no error
     }
     return c1;
-})();
+}());
 var c1NoError = (function () {
     function c1NoError(_i) {
         var _i = 10; // no error
     }
     return c1NoError;
-})();
+}());
 var c2 = (function () {
     function c2() {
         var restParameters = [];
@@ -93,13 +93,13 @@ var c2 = (function () {
         var _i = 10; // no error
     }
     return c2;
-})();
+}());
 var c2NoError = (function () {
     function c2NoError() {
         var _i = 10; // no error
     }
     return c2NoError;
-})();
+}());
 var c3 = (function () {
     function c3(_i) {
         var restParameters = [];
@@ -110,14 +110,14 @@ var c3 = (function () {
         var _i = 10; // no error
     }
     return c3;
-})();
+}());
 var c3NoError = (function () {
     function c3NoError(_i) {
         this._i = _i;
         var _i = 10; // no error
     }
     return c3NoError;
-})();
+}());
 var c5 = (function () {
     function c5(_i) {
         var rest = [];
@@ -127,10 +127,10 @@ var c5 = (function () {
         var _i; // no error
     }
     return c5;
-})();
+}());
 var c5NoError = (function () {
     function c5NoError(_i) {
         var _i; // no error
     }
     return c5NoError;
-})();
+}());
diff --git a/tests/baselines/reference/collisionRestParameterClassMethod.js b/tests/baselines/reference/collisionRestParameterClassMethod.js
index e3471c85f1c9a..eb92faa7b2ac8 100644
--- a/tests/baselines/reference/collisionRestParameterClassMethod.js
+++ b/tests/baselines/reference/collisionRestParameterClassMethod.js
@@ -63,7 +63,7 @@ var c1 = (function () {
         var _i; // no error
     };
     return c1;
-})();
+}());
 var c3 = (function () {
     function c3() {
     }
@@ -78,4 +78,4 @@ var c3 = (function () {
         var _i = 10; // no error
     };
     return c3;
-})();
+}());
diff --git a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js
index adc9c09de27d2..97e82a1523f0e 100644
--- a/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js
+++ b/tests/baselines/reference/collisionRestParameterUnderscoreIUsage.js
@@ -19,5 +19,5 @@ var Foo = (function () {
         console.log(_i); // This should result in error
     }
     return Foo;
-})();
+}());
 new Foo();
diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
index 731f3d4f064e5..fc64a8012eeb9 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
@@ -64,7 +64,7 @@ var Foo = (function () {
         configurable: true
     });
     return Foo;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -84,7 +84,7 @@ var b = (function (_super) {
         configurable: true
     });
     return b;
-})(Foo);
+}(Foo));
 var c = (function (_super) {
     __extends(c, _super);
     function c() {
@@ -108,4 +108,4 @@ var c = (function (_super) {
         configurable: true
     });
     return c;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
index 06acaa0e02adb..b6e7cb121d67e 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
@@ -38,7 +38,7 @@ var Foo = (function () {
         }
     }
     return Foo;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -47,7 +47,7 @@ var b = (function (_super) {
         }
     }
     return b;
-})(Foo);
+}(Foo));
 var c = (function (_super) {
     __extends(c, _super);
     function c() {
@@ -58,4 +58,4 @@ var c = (function (_super) {
         };
     }
     return c;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
index 6702ba8ac3dac..14b8bf4669706 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
@@ -46,7 +46,7 @@ var Foo = (function () {
     Foo.prototype._super = function () {
     };
     return Foo;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -59,7 +59,7 @@ var b = (function (_super) {
     b.prototype._super = function () {
     };
     return b;
-})(Foo);
+}(Foo));
 var c = (function (_super) {
     __extends(c, _super);
     function c() {
@@ -74,4 +74,4 @@ var c = (function (_super) {
     c.prototype._super = function () {
     };
     return c;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
index 8d13eed617b04..2af7a6a870e8c 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
@@ -36,7 +36,7 @@ var Foo = (function () {
         };
     }
     return Foo;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -49,4 +49,4 @@ var b = (function (_super) {
         };
     }
     return b;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
index 12685727795f9..6887a22ae204d 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
@@ -54,7 +54,7 @@ var Foo = (function () {
         configurable: true
     });
     return Foo;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -72,7 +72,7 @@ var b = (function (_super) {
         configurable: true
     });
     return b;
-})(Foo);
+}(Foo));
 var c = (function (_super) {
     __extends(c, _super);
     function c() {
@@ -94,4 +94,4 @@ var c = (function (_super) {
         configurable: true
     });
     return c;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js b/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
index 6f5434928980e..d3b5e7a20306f 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
@@ -32,7 +32,7 @@ var Foo = (function () {
         var _super = 10; // No error
     }
     return Foo;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -40,7 +40,7 @@ var b = (function (_super) {
         var _super = 10; // Should be error 
     }
     return b;
-})(Foo);
+}(Foo));
 var c = (function (_super) {
     __extends(c, _super);
     function c() {
@@ -50,4 +50,4 @@ var c = (function (_super) {
         };
     }
     return c;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js b/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
index 373ee270014be..4553608756df1 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
@@ -32,7 +32,7 @@ var Foo = (function () {
         var _super = 10; // No error
     };
     return Foo;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -42,7 +42,7 @@ var b = (function (_super) {
         var _super = 10; // Should be error 
     };
     return b;
-})(Foo);
+}(Foo));
 var c = (function (_super) {
     __extends(c, _super);
     function c() {
@@ -54,4 +54,4 @@ var c = (function (_super) {
         };
     };
     return c;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js b/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
index 7ba9b40785891..df5d812cf54d9 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
@@ -34,7 +34,7 @@ var Foo = (function () {
         this._super = 10; // No error
     }
     return Foo;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -47,4 +47,4 @@ var b = (function (_super) {
         this._super = 10; // No error
     }
     return b;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/collisionSuperAndNameResolution.js b/tests/baselines/reference/collisionSuperAndNameResolution.js
index 5cddcc018455c..2db90d8b02663 100644
--- a/tests/baselines/reference/collisionSuperAndNameResolution.js
+++ b/tests/baselines/reference/collisionSuperAndNameResolution.js
@@ -23,7 +23,7 @@ var base = (function () {
     function base() {
     }
     return base;
-})();
+}());
 var Foo = (function (_super) {
     __extends(Foo, _super);
     function Foo() {
@@ -33,4 +33,4 @@ var Foo = (function (_super) {
         console.log(_super); // Error as this doesnt not resolve to user defined _super
     };
     return Foo;
-})(base);
+}(base));
diff --git a/tests/baselines/reference/collisionSuperAndParameter.js b/tests/baselines/reference/collisionSuperAndParameter.js
index 965887d6d1b3b..29b5ad3b496ee 100644
--- a/tests/baselines/reference/collisionSuperAndParameter.js
+++ b/tests/baselines/reference/collisionSuperAndParameter.js
@@ -90,7 +90,7 @@ var Foo = (function () {
         configurable: true
     });
     return Foo;
-})();
+}());
 var Foo2 = (function (_super) {
     __extends(Foo2, _super);
     function Foo2(_super) {
@@ -119,7 +119,7 @@ var Foo2 = (function (_super) {
         configurable: true
     });
     return Foo2;
-})(Foo);
+}(Foo));
 var Foo4 = (function (_super) {
     __extends(Foo4, _super);
     function Foo4(_super) {
@@ -132,4 +132,4 @@ var Foo4 = (function (_super) {
         };
     };
     return Foo4;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/collisionSuperAndParameter1.js b/tests/baselines/reference/collisionSuperAndParameter1.js
index f6d1f23947d98..517c126ab449f 100644
--- a/tests/baselines/reference/collisionSuperAndParameter1.js
+++ b/tests/baselines/reference/collisionSuperAndParameter1.js
@@ -19,7 +19,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function (_super) {
     __extends(Foo2, _super);
     function Foo2() {
@@ -30,4 +30,4 @@ var Foo2 = (function (_super) {
         };
     };
     return Foo2;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js b/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
index f54bbef28a87b..f94a9fde5f252 100644
--- a/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
+++ b/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
@@ -40,14 +40,14 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b1 = (function (_super) {
     __extends(b1, _super);
     function b1(_super) {
         _super.call(this);
     }
     return b1;
-})(a);
+}(a));
 var b2 = (function (_super) {
     __extends(b2, _super);
     function b2(_super) {
@@ -55,14 +55,14 @@ var b2 = (function (_super) {
         this._super = _super;
     }
     return b2;
-})(a);
+}(a));
 var b3 = (function (_super) {
     __extends(b3, _super);
     function b3(_super) {
         _super.call(this);
     }
     return b3;
-})(a);
+}(a));
 var b4 = (function (_super) {
     __extends(b4, _super);
     function b4(_super) {
@@ -70,4 +70,4 @@ var b4 = (function (_super) {
         this._super = _super;
     }
     return b4;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js
index ccaa335d80ee3..09dcee3caad55 100644
--- a/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js
+++ b/tests/baselines/reference/collisionThisExpressionAndClassInGlobal.js
@@ -9,5 +9,5 @@ var _this = (function () {
     function _this() {
     }
     return _this;
-})();
+}());
 var f = function () { return _this; };
diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js
index 53df2984544ec..e2f22cdf3e637 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInAccessors.js
@@ -71,7 +71,7 @@ var class1 = (function () {
         configurable: true
     });
     return class1;
-})();
+}());
 var class2 = (function () {
     function class2() {
     }
@@ -99,4 +99,4 @@ var class2 = (function () {
         configurable: true
     });
     return class2;
-})();
+}());
diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js
index d0ed79da53088..e402749998870 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInConstructor.js
@@ -33,7 +33,7 @@ var class1 = (function () {
         };
     }
     return class1;
-})();
+}());
 var class2 = (function () {
     function class2() {
         var _this = this;
@@ -45,4 +45,4 @@ var class2 = (function () {
         };
     }
     return class2;
-})();
+}());
diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js
index 63b536bd8b60b..7c71fd79ade1a 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInMethod.js
@@ -41,4 +41,4 @@ var a = (function () {
         };
     };
     return a;
-})();
+}());
diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js
index 65d181921d5f3..2a54b5fd7e6b3 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarInProperty.js
@@ -31,7 +31,7 @@ var class1 = (function () {
         };
     }
     return class1;
-})();
+}());
 var class2 = (function () {
     function class2() {
         var _this = this;
@@ -43,4 +43,4 @@ var class2 = (function () {
         var _this = 2;
     }
     return class2;
-})();
+}());
diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
index eb2ddd825fba3..c71b0dcf1ddff 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
@@ -30,7 +30,7 @@ var a = (function () {
     a.prototype.foo = function () {
     };
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -42,7 +42,7 @@ var b = (function (_super) {
         var f = function () { return _super.prototype.foo.call(_this); };
     };
     return b;
-})(a);
+}(a));
 var b2 = (function (_super) {
     __extends(b2, _super);
     function b2() {
@@ -56,4 +56,4 @@ var b2 = (function (_super) {
         };
     };
     return b2;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js
index 777f141451b40..240817ac0b944 100644
--- a/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js
+++ b/tests/baselines/reference/collisionThisExpressionAndModuleInGlobal.js
@@ -13,6 +13,6 @@ var _this;
         function c() {
         }
         return c;
-    })();
+    }());
 })(_this || (_this = {}));
 var f = function () { return _this; };
diff --git a/tests/baselines/reference/collisionThisExpressionAndNameResolution.js b/tests/baselines/reference/collisionThisExpressionAndNameResolution.js
index 8b128d9294629..130f99bcd9079 100644
--- a/tests/baselines/reference/collisionThisExpressionAndNameResolution.js
+++ b/tests/baselines/reference/collisionThisExpressionAndNameResolution.js
@@ -26,4 +26,4 @@ var Foo = (function () {
         }
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/collisionThisExpressionAndParameter.js b/tests/baselines/reference/collisionThisExpressionAndParameter.js
index 3a19cf20d5af6..bc15e4b56b50a 100644
--- a/tests/baselines/reference/collisionThisExpressionAndParameter.js
+++ b/tests/baselines/reference/collisionThisExpressionAndParameter.js
@@ -130,7 +130,7 @@ var Foo = (function () {
         };
     };
     return Foo;
-})();
+}());
 var Foo1 = (function () {
     function Foo1(_this) {
         var _this = this;
@@ -141,7 +141,7 @@ var Foo1 = (function () {
         };
     }
     return Foo1;
-})();
+}());
 function f1(_this) {
     var _this = this;
     (function (x) { console.log(_this.x); });
@@ -162,7 +162,7 @@ var Foo3 = (function () {
         };
     };
     return Foo3;
-})();
+}());
 function f3(_this) {
     var _this = this;
     (function (x) { console.log(_this.x); });
diff --git a/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js b/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js
index a77098739ec8e..b8218cd38ff29 100644
--- a/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js
+++ b/tests/baselines/reference/collisionThisExpressionAndPropertyNameAsConstuctorParameter.js
@@ -44,7 +44,7 @@ var Foo2 = (function () {
         };
     }
     return Foo2;
-})();
+}());
 var Foo3 = (function () {
     function Foo3(_this) {
         var _this = this;
@@ -54,7 +54,7 @@ var Foo3 = (function () {
         };
     }
     return Foo3;
-})();
+}());
 var Foo4 = (function () {
     function Foo4(_this) {
         var _this = this;
@@ -63,7 +63,7 @@ var Foo4 = (function () {
         };
     }
     return Foo4;
-})();
+}());
 var Foo5 = (function () {
     function Foo5(_this) {
         var _this = this;
@@ -73,4 +73,4 @@ var Foo5 = (function () {
         };
     }
     return Foo5;
-})();
+}());
diff --git a/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js b/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js
index 90c16543ff26f..ef8148639343c 100644
--- a/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js
+++ b/tests/baselines/reference/commaOperatorWithSecondOperandObjectType.js
@@ -49,7 +49,7 @@ var CLASS = (function () {
     function CLASS() {
     }
     return CLASS;
-})();
+}());
 //The second operand type is Object
 ANY, OBJECT;
 BOOLEAN, OBJECT;
diff --git a/tests/baselines/reference/commentBeforeStaticMethod1.js b/tests/baselines/reference/commentBeforeStaticMethod1.js
index 5c45f6a8cba6a..2d5fb6ace2e85 100644
--- a/tests/baselines/reference/commentBeforeStaticMethod1.js
+++ b/tests/baselines/reference/commentBeforeStaticMethod1.js
@@ -19,4 +19,4 @@ var C = (function () {
         return "bar";
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/commentOnClassAccessor1.js b/tests/baselines/reference/commentOnClassAccessor1.js
index 428e500da55f1..0c3e4c1848fd0 100644
--- a/tests/baselines/reference/commentOnClassAccessor1.js
+++ b/tests/baselines/reference/commentOnClassAccessor1.js
@@ -19,4 +19,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/commentOnClassAccessor2.js b/tests/baselines/reference/commentOnClassAccessor2.js
index 22a6b69f6c35f..3b58cc28abd27 100644
--- a/tests/baselines/reference/commentOnClassAccessor2.js
+++ b/tests/baselines/reference/commentOnClassAccessor2.js
@@ -28,4 +28,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/commentOnClassMethod1.js b/tests/baselines/reference/commentOnClassMethod1.js
index 1f924ba233fb2..4b909da55a44c 100644
--- a/tests/baselines/reference/commentOnClassMethod1.js
+++ b/tests/baselines/reference/commentOnClassMethod1.js
@@ -17,4 +17,4 @@ var WebControls = (function () {
     WebControls.prototype.createControl = function () {
     };
     return WebControls;
-})();
+}());
diff --git a/tests/baselines/reference/commentOnSignature1.js b/tests/baselines/reference/commentOnSignature1.js
index d29710c631c93..38437d6fd1312 100644
--- a/tests/baselines/reference/commentOnSignature1.js
+++ b/tests/baselines/reference/commentOnSignature1.js
@@ -50,7 +50,7 @@ var c = (function () {
     c.prototype.foo = function (a) {
     };
     return c;
-})();
+}());
 //// [b.js]
 ///<reference path='a.ts'/>
 function foo2(a) {
diff --git a/tests/baselines/reference/commentOnStaticMember1.js b/tests/baselines/reference/commentOnStaticMember1.js
index b6b9628cad1ff..ba9973693044c 100644
--- a/tests/baselines/reference/commentOnStaticMember1.js
+++ b/tests/baselines/reference/commentOnStaticMember1.js
@@ -13,4 +13,4 @@ var Greeter = (function () {
     Greeter.foo = function () {
     };
     return Greeter;
-})();
+}());
diff --git a/tests/baselines/reference/commentsClass.js b/tests/baselines/reference/commentsClass.js
index b42235e9afe45..574fc0252278a 100644
--- a/tests/baselines/reference/commentsClass.js
+++ b/tests/baselines/reference/commentsClass.js
@@ -79,7 +79,7 @@ var c2 = (function () {
     function c2() {
     }
     return c2;
-})(); // trailing comment1
+}()); // trailing comment1
 var i2 = new c2();
 var i2_c = c2;
 var c3 = (function () {
@@ -87,7 +87,7 @@ var c3 = (function () {
     function c3() {
     } // trailing comment of constructor
     return c3;
-})(); /* trailing comment 2 */
+}()); /* trailing comment 2 */
 var i3 = new c3();
 var i3_c = c3;
 /** Class comment*/
@@ -96,7 +96,7 @@ var c4 = (function () {
     function c4() {
     } /* trailing comment of constructor 2*/
     return c4;
-})();
+}());
 var i4 = new c4();
 var i4_c = c4;
 /** Class with statics*/
@@ -104,7 +104,7 @@ var c5 = (function () {
     function c5() {
     }
     return c5;
-})();
+}());
 var i5 = new c5();
 var i5_c = c5;
 /// class with statics and constructor
@@ -113,7 +113,7 @@ var c6 = (function () {
     function c6() {
     }
     return c6;
-})();
+}());
 var i6 = new c6();
 var i6_c = c6;
 // class with statics and constructor
@@ -122,7 +122,7 @@ var c7 = (function () {
     function c7() {
     }
     return c7;
-})();
+}());
 var i7 = new c7();
 var i7_c = c7;
 /** class with statics and constructor
@@ -135,7 +135,7 @@ var c8 = (function () {
         */
     }
     return c8;
-})();
+}());
 var i8 = new c8();
 var i8_c = c8;
 var c9 = (function () {
@@ -144,7 +144,7 @@ var c9 = (function () {
         // should emit this leading comment of } too
     }
     return c9;
-})();
+}());
 
 
 //// [commentsClass.d.ts]
diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js
index 298991c2eeff9..fe2dc0a63d093 100644
--- a/tests/baselines/reference/commentsClassMembers.js
+++ b/tests/baselines/reference/commentsClassMembers.js
@@ -413,7 +413,7 @@ var c1 = (function () {
         configurable: true
     });
     return c1;
-})();
+}());
 var i1 = new c1();
 var i1_p = i1.p1;
 var i1_f = i1.p2;
@@ -473,7 +473,7 @@ var cProperties = (function () {
         configurable: true
     });
     return cProperties;
-})();
+}());
 var cProperties_i = new cProperties();
 cProperties_i.p2 = cProperties_i.p1;
 cProperties_i.nc_p2 = cProperties_i.nc_p1;
diff --git a/tests/baselines/reference/commentsCommentParsing.js b/tests/baselines/reference/commentsCommentParsing.js
index 2f2746145e50f..24b2a459bf72d 100644
--- a/tests/baselines/reference/commentsCommentParsing.js
+++ b/tests/baselines/reference/commentsCommentParsing.js
@@ -288,7 +288,7 @@ var NoQuickInfoClass = (function () {
     function NoQuickInfoClass() {
     }
     return NoQuickInfoClass;
-})();
+}());
 
 
 //// [commentsCommentParsing.d.ts]
diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js
index ef3e591b55e8e..b4819ce9ca34a 100644
--- a/tests/baselines/reference/commentsDottedModuleName.js
+++ b/tests/baselines/reference/commentsDottedModuleName.js
@@ -20,7 +20,7 @@ define(["require", "exports"], function (require, exports) {
                 function b() {
                 }
                 return b;
-            })();
+            }());
             InnerModule.b = b;
         })(InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {}));
     })(outerModule = exports.outerModule || (exports.outerModule = {}));
diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js
index f1a5781d67b55..1fe24c676a7ba 100644
--- a/tests/baselines/reference/commentsExternalModules.js
+++ b/tests/baselines/reference/commentsExternalModules.js
@@ -79,7 +79,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             m2.c = c;
             ;
             /** i*/
@@ -110,7 +110,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             m2.c = c;
             ;
             /** i */
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
index ce367a136e3e0..18f3564ec7f82 100644
--- a/tests/baselines/reference/commentsExternalModules2.js
+++ b/tests/baselines/reference/commentsExternalModules2.js
@@ -79,7 +79,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             m2.c = c;
             ;
             /** i*/
@@ -110,7 +110,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             m2.c = c;
             ;
             /** i */
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
index 76ff906155ae1..85fbcfe019fca 100644
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ b/tests/baselines/reference/commentsExternalModules3.js
@@ -78,7 +78,7 @@ var m1;
             function c() {
             }
             return c;
-        })();
+        }());
         m2.c = c;
         ;
         /** i*/
@@ -109,7 +109,7 @@ var m4;
             function c() {
             }
             return c;
-        })();
+        }());
         m2.c = c;
         ;
         /** i */
diff --git a/tests/baselines/reference/commentsFormatting.js b/tests/baselines/reference/commentsFormatting.js
index 6dc68b06b9fb5..cfee157eada66 100644
--- a/tests/baselines/reference/commentsFormatting.js
+++ b/tests/baselines/reference/commentsFormatting.js
@@ -107,7 +107,7 @@ var m;
         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
@@ -131,7 +131,7 @@ var m;
         function c2() {
         }
         return c2;
-    })();
+    }());
     m.c2 = c2;
     /** this is comment with new lines in between
 
@@ -163,7 +163,7 @@ this is 4 spaces left aligned but above line is empty
         function c3() {
         }
         return c3;
-    })();
+    }());
     m.c3 = c3;
     /** this is first line - aligned to class declaration
     *              this is 0 space + tab
@@ -183,7 +183,7 @@ this is 4 spaces left aligned but above line is empty
         function c4() {
         }
         return c4;
-    })();
+    }());
     m.c4 = c4;
 })(m || (m = {}));
 
diff --git a/tests/baselines/reference/commentsInheritance.js b/tests/baselines/reference/commentsInheritance.js
index 33726436189a8..b9d84b2475a7e 100644
--- a/tests/baselines/reference/commentsInheritance.js
+++ b/tests/baselines/reference/commentsInheritance.js
@@ -172,7 +172,7 @@ var c1 = (function () {
     c1.prototype.nc_f1 = function () {
     };
     return c1;
-})();
+}());
 var i1_i;
 var c1_i = new c1();
 // assign to interface
@@ -223,7 +223,7 @@ var c2 = (function () {
         configurable: true
     });
     return c2;
-})();
+}());
 var c3 = (function (_super) {
     __extends(c3, _super);
     function c3() {
@@ -250,7 +250,7 @@ var c3 = (function (_super) {
         configurable: true
     });
     return c3;
-})(c2);
+}(c2));
 var c2_i = new c2(10);
 var c3_i = new c3();
 // assign
@@ -261,7 +261,7 @@ var c4 = (function (_super) {
         _super.apply(this, arguments);
     }
     return c4;
-})(c2);
+}(c2));
 var c4_i = new c4(10);
 var i2_i;
 var i3_i;
diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js
index aa5cd2fb7fa29..f2574dcddfb9a 100644
--- a/tests/baselines/reference/commentsModules.js
+++ b/tests/baselines/reference/commentsModules.js
@@ -113,7 +113,7 @@ var m1;
             function c() {
             }
             return c;
-        })();
+        }());
         m2.c = c;
         ;
         /** i*/
@@ -152,7 +152,7 @@ var m2;
             function c() {
             }
             return c;
-        })();
+        }());
         m3.c = c;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 || (m2 = {})); /* trailing dotted module comment*/
@@ -169,7 +169,7 @@ var m3;
                 function c() {
                 }
                 return c;
-            })();
+            }());
             m5.c = c;
         })(m5 = m4.m5 || (m4.m5 = {}));
     })(m4 = m3.m4 || (m3.m4 = {}));
@@ -189,7 +189,7 @@ var m4;
                     function c() {
                     }
                     return c;
-                })();
+                }());
                 m7.c = c;
             })(m7 = m6.m7 || (m6.m7 = {})); /* trailing inner module */ /* multiple comments*/
         })(m6 = m5.m6 || (m5.m6 = {}));
@@ -211,7 +211,7 @@ var m5;
                     function c() {
                     }
                     return c;
-                })();
+                }());
                 m8.c = c;
             })(m8 = m7.m8 || (m7.m8 = {}));
         })(m7 = m6.m7 || (m6.m7 = {}));
@@ -229,7 +229,7 @@ var m6;
                 function c() {
                 }
                 return c;
-            })();
+            }());
             m8.c = c;
         })(m8 = m7.m8 || (m7.m8 = {}));
     })(m7 = m6.m7 || (m6.m7 = {}));
@@ -247,20 +247,20 @@ var m7;
                 function c() {
                 }
                 return c;
-            })();
+            }());
             m9.c = c;
             /** class d */
             var d = (function () {
                 function d() {
                 }
                 return d;
-            })();
+            }());
             // class e
             var e = (function () {
                 function e() {
                 }
                 return e;
-            })();
+            }());
             m9.e = e;
         })(m9 = m8.m9 || (m8.m9 = {}));
     })(m8 = m7.m8 || (m7.m8 = {}));
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js
index cf85a1b1c02d6..5b30279def5dc 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.js
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js
@@ -47,7 +47,7 @@ define(["require", "exports"], function (require, exports) {
             function b() {
             }
             return b;
-        })();
+        }());
         multiM.b = b;
     })(multiM = exports.multiM || (exports.multiM = {}));
     /** thi is multi module 2*/
@@ -58,14 +58,14 @@ define(["require", "exports"], function (require, exports) {
             function c() {
             }
             return c;
-        })();
+        }());
         multiM.c = c;
         // class e comment
         var e = (function () {
             function e() {
             }
             return e;
-        })();
+        }());
         multiM.e = e;
     })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.b();
@@ -82,14 +82,14 @@ define(["require", "exports"], function (require, exports) {
             function d() {
             }
             return d;
-        })();
+        }());
         multiM.d = d;
         /// class f comment
         var f = (function () {
             function f() {
             }
             return f;
-        })();
+        }());
         multiM.f = f;
     })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.d();
diff --git a/tests/baselines/reference/commentsMultiModuleSingleFile.js b/tests/baselines/reference/commentsMultiModuleSingleFile.js
index 133cc57988910..63b6c67888b5f 100644
--- a/tests/baselines/reference/commentsMultiModuleSingleFile.js
+++ b/tests/baselines/reference/commentsMultiModuleSingleFile.js
@@ -33,14 +33,14 @@ var multiM;
         function b() {
         }
         return b;
-    })();
+    }());
     multiM.b = b;
     // class d
     var d = (function () {
         function d() {
         }
         return d;
-    })();
+    }());
     multiM.d = d;
 })(multiM || (multiM = {}));
 /// this is multi module 2
@@ -51,14 +51,14 @@ var multiM;
         function c() {
         }
         return c;
-    })();
+    }());
     multiM.c = c;
     /// class e
     var e = (function () {
         function e() {
         }
         return e;
-    })();
+    }());
     multiM.e = e;
 })(multiM || (multiM = {}));
 new multiM.b();
diff --git a/tests/baselines/reference/commentsOnReturnStatement1.js b/tests/baselines/reference/commentsOnReturnStatement1.js
index c2fcb14690d4a..67c8462bd388a 100644
--- a/tests/baselines/reference/commentsOnReturnStatement1.js
+++ b/tests/baselines/reference/commentsOnReturnStatement1.js
@@ -20,4 +20,4 @@ var DebugClass = (function () {
         return true;
     };
     return DebugClass;
-})();
+}());
diff --git a/tests/baselines/reference/commentsOnStaticMembers.js b/tests/baselines/reference/commentsOnStaticMembers.js
index 867c412894067..51ed906841d8a 100644
--- a/tests/baselines/reference/commentsOnStaticMembers.js
+++ b/tests/baselines/reference/commentsOnStaticMembers.js
@@ -33,4 +33,4 @@ var test = (function () {
      */
     test.p3 = "";
     return test;
-})();
+}());
diff --git a/tests/baselines/reference/commentsOverloads.js b/tests/baselines/reference/commentsOverloads.js
index d55993572c01f..e711a9585ce28 100644
--- a/tests/baselines/reference/commentsOverloads.js
+++ b/tests/baselines/reference/commentsOverloads.js
@@ -219,34 +219,34 @@ var c = (function () {
         return 10;
     };
     return c;
-})();
+}());
 var c1 = (function () {
     function c1(aorb) {
     }
     return c1;
-})();
+}());
 var c2 = (function () {
     function c2(aorb) {
     }
     return c2;
-})();
+}());
 var c3 = (function () {
     function c3(aorb) {
     }
     return c3;
-})();
+}());
 var c4 = (function () {
     /** c4 3 */
     function c4(aorb) {
     }
     return c4;
-})();
+}());
 var c5 = (function () {
     /** c5 implementation*/
     function c5(aorb) {
     }
     return c5;
-})();
+}());
 var c_i = new c();
 var c1_i_1 = new c1(10);
 var c1_i_2 = new c1("hello");
diff --git a/tests/baselines/reference/commentsTypeParameters.js b/tests/baselines/reference/commentsTypeParameters.js
index 768c238522aaa..003cafe70adfb 100644
--- a/tests/baselines/reference/commentsTypeParameters.js
+++ b/tests/baselines/reference/commentsTypeParameters.js
@@ -28,7 +28,7 @@ var C = (function () {
     C.privatestaticmethod = function (a) {
     };
     return C;
-})();
+}());
 function compare(a, b) {
     return a === b;
 }
diff --git a/tests/baselines/reference/commentsdoNotEmitComments.js b/tests/baselines/reference/commentsdoNotEmitComments.js
index 301ab56e4c079..b77f51348f0a7 100644
--- a/tests/baselines/reference/commentsdoNotEmitComments.js
+++ b/tests/baselines/reference/commentsdoNotEmitComments.js
@@ -121,7 +121,7 @@ var c = (function () {
         return aOrb.toString();
     };
     return c;
-})();
+}());
 var i = new c();
 var i1_i;
 var m1;
@@ -131,7 +131,7 @@ var m1;
             this.x = x;
         }
         return b;
-    })();
+    }());
     m1.b = b;
 })(m1 || (m1 = {}));
 var shade = 1;
diff --git a/tests/baselines/reference/commentsemitComments.js b/tests/baselines/reference/commentsemitComments.js
index 173d9e8fd4783..442f558bcfaaa 100644
--- a/tests/baselines/reference/commentsemitComments.js
+++ b/tests/baselines/reference/commentsemitComments.js
@@ -126,7 +126,7 @@ var c = (function () {
         return aOrb.toString();
     };
     return c;
-})();
+}());
 /**instance comment*/
 var i = new c();
 /**interface instance comments*/
@@ -140,7 +140,7 @@ var m1;
             this.x = x;
         }
         return b;
-    })();
+    }());
     m1.b = b;
 })(m1 || (m1 = {}));
 
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index e43b321893af3..3f49588c10331 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -21,7 +21,7 @@ var C1 = (function () {
     }
     C1.s1 = true;
     return C1;
-})();
+}());
 exports.C1 = C1;
 //// [foo_1.js]
 "use strict";
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
index 8ecda412106aa..720554f7e32b1 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
@@ -39,7 +39,7 @@ var C1 = (function () {
     }
     C1.s1 = true;
     return C1;
-})();
+}());
 exports.C1 = C1;
 (function (E1) {
     E1[E1["A"] = 0] = "A";
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
index d59ec76468005..0de25c1501337 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
@@ -207,7 +207,7 @@ var A1 = (function () {
         return null;
     };
     return A1;
-})();
+}());
 var B1 = (function () {
     function B1() {
     }
@@ -215,7 +215,7 @@ var B1 = (function () {
         return null;
     };
     return B1;
-})();
+}());
 var Base = (function () {
     function Base() {
     }
@@ -223,21 +223,21 @@ var Base = (function () {
         return null;
     };
     return Base;
-})();
+}());
 var A2 = (function (_super) {
     __extends(A2, _super);
     function A2() {
         _super.apply(this, arguments);
     }
     return A2;
-})(Base);
+}(Base));
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
         _super.apply(this, arguments);
     }
     return B2;
-})(Base);
+}(Base));
 var a1;
 var a2;
 var a3;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
index 4bbc7675a315c..4185af60dbc9f 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
@@ -178,19 +178,19 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
index 397c7e9d8e47f..90c67439773a7 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
@@ -178,19 +178,19 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
index 9f3c037538db5..736b57e08bacc 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
@@ -121,19 +121,19 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
index 68ebcb9d596c5..ca7eea70ad651 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
@@ -159,19 +159,19 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
index 60177f0ea2208..c64e33827c58e 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
@@ -159,19 +159,19 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js
index d630821119129..715b347846e09 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnProperty.js
@@ -81,22 +81,22 @@ var A1 = (function () {
     function A1() {
     }
     return A1;
-})();
+}());
 var B1 = (function () {
     function B1() {
     }
     return B1;
-})();
+}());
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var B2 = (function () {
     function B2() {
     }
     return B2;
-})();
+}());
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
index 27d1b68c85d0b..dc7a12eecdc94 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
@@ -269,14 +269,14 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
index 5a98e12b00199..d4be6df98dd05 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
@@ -231,14 +231,14 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
index 24069615e0ab1..ee5ad2fbd076c 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
@@ -117,14 +117,14 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
index f0dac057ca31a..79e4bfd0bbfcb 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
@@ -174,14 +174,14 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
index eaf1aca728d21..31c0dd3c7c557 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
@@ -174,14 +174,14 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var a1;
 var b1;
 var a2;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
index 822d4b7520a13..5decd7a21fb09 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
@@ -88,36 +88,36 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var A1 = (function () {
     function A1() {
     }
     return A1;
-})();
+}());
 var B1 = (function () {
     function B1() {
     }
     return B1;
-})();
+}());
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
         _super.apply(this, arguments);
     }
     return B2;
-})(A2);
+}(A2));
 var a1;
 var a2;
 var b1;
diff --git a/tests/baselines/reference/complexClassRelationships.js b/tests/baselines/reference/complexClassRelationships.js
index ca2b31a805c32..46974055171c9 100644
--- a/tests/baselines/reference/complexClassRelationships.js
+++ b/tests/baselines/reference/complexClassRelationships.js
@@ -64,18 +64,18 @@ var Derived = (function (_super) {
         return item;
     };
     return Derived;
-})(Base);
+}(Base));
 var BaseCollection = (function () {
     function BaseCollection(f) {
         (function (item) { return [item.Components]; });
     }
     return BaseCollection;
-})();
+}());
 var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Thing = (function () {
     function Thing() {
     }
@@ -85,7 +85,7 @@ var Thing = (function () {
         configurable: true
     });
     return Thing;
-})();
+}());
 var ComponentCollection = (function () {
     function ComponentCollection() {
     }
@@ -93,7 +93,7 @@ var ComponentCollection = (function () {
         return p.prop1;
     };
     return ComponentCollection;
-})();
+}());
 var Foo = (function () {
     function Foo() {
     }
@@ -115,16 +115,16 @@ var Foo = (function () {
         configurable: true
     });
     return Foo;
-})();
+}());
 var GenericType = (function () {
     function GenericType(parent) {
     }
     return GenericType;
-})();
+}());
 var FooBase = (function () {
     function FooBase() {
     }
     FooBase.prototype.populate = function () {
     };
     return FooBase;
-})();
+}());
diff --git a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
index 71c1cee164f35..3d885d3eef12c 100644
--- a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
+++ b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
@@ -17,5 +17,5 @@ var S18 = (function (_super) {
         _super.apply(this, arguments);
     }
     return S18;
-})(S18);
+}(S18));
 (new S18(123)).S18 = 0;
diff --git a/tests/baselines/reference/complicatedPrivacy.js b/tests/baselines/reference/complicatedPrivacy.js
index 7f431f3d13645..ffb328f2e94c3 100644
--- a/tests/baselines/reference/complicatedPrivacy.js
+++ b/tests/baselines/reference/complicatedPrivacy.js
@@ -131,7 +131,7 @@ var m1;
                 return "Hello world";
             };
             return C2;
-        })();
+        }());
         m2.C2 = C2;
     })(m2 = m1.m2 || (m1.m2 = {}));
     function f2(arg1) {
@@ -156,19 +156,19 @@ var m1;
         function C1() {
         }
         return C1;
-    })();
+    }());
     var C5 = (function () {
         function C5() {
         }
         return C5;
-    })();
+    }());
     m1.C5 = C5;
 })(m1 || (m1 = {}));
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var m2;
 (function (m2) {
     var m3;
@@ -180,7 +180,7 @@ var m2;
                 return "Hello";
             };
             return c_pr;
-        })();
+        }());
         m3.c_pr = c_pr;
         var m4;
         (function (m4) {
@@ -188,7 +188,7 @@ var m2;
                 function C() {
                 }
                 return C;
-            })();
+            }());
             var m5;
             (function (m5) {
                 var m6;
diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.js b/tests/baselines/reference/compoundAssignmentLHSIsValue.js
index bf66183b70a62..a55c068d4a422 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js
@@ -146,7 +146,7 @@ var C = (function () {
         this += value;
     };
     return C;
-})();
+}());
 function foo() {
     this *= value;
     this += value;
@@ -210,7 +210,7 @@ var Derived = (function (_super) {
         _super. += value;
     };
     return Derived;
-})(C);
+}(C));
 // function expression
 function bar1() { }
 value;
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
index f4e14e5424220..70ebca89005e9 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
@@ -105,7 +105,7 @@ var C = (function () {
         this = Math.pow(this, value);
     };
     return C;
-})();
+}());
 function foo() {
     this = Math.pow(this, value);
 }
@@ -152,7 +152,7 @@ var Derived = (function (_super) {
         var _a;
     };
     return Derived;
-})(C);
+}(C));
 // function expression
 function bar1() { }
 value;
diff --git a/tests/baselines/reference/computedPropertyNames12_ES5.js b/tests/baselines/reference/computedPropertyNames12_ES5.js
index c73ea11286fb4..2aec8856286cb 100644
--- a/tests/baselines/reference/computedPropertyNames12_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames12_ES5.js
@@ -28,4 +28,4 @@ var C = (function () {
     }
     C["hello " + a + " bye"] = 0;
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames13_ES5.js b/tests/baselines/reference/computedPropertyNames13_ES5.js
index 89562162911a4..0b713c5c8d78c 100644
--- a/tests/baselines/reference/computedPropertyNames13_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames13_ES5.js
@@ -35,4 +35,4 @@ var C = (function () {
     C.prototype["hello bye"] = function () { };
     C["hello " + a + " bye"] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames14_ES5.js b/tests/baselines/reference/computedPropertyNames14_ES5.js
index 5db5e842a2ac0..e08ae0fd640de 100644
--- a/tests/baselines/reference/computedPropertyNames14_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames14_ES5.js
@@ -21,4 +21,4 @@ var C = (function () {
     C.prototype[undefined] = function () { };
     C[null] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames15_ES5.js b/tests/baselines/reference/computedPropertyNames15_ES5.js
index 93258b64c7506..91ec9332be8cc 100644
--- a/tests/baselines/reference/computedPropertyNames15_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames15_ES5.js
@@ -19,4 +19,4 @@ var C = (function () {
     C.prototype[p2] = function () { };
     C.prototype[p3] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames16_ES5.js b/tests/baselines/reference/computedPropertyNames16_ES5.js
index f4d90579d63aa..5d8471e6560a4 100644
--- a/tests/baselines/reference/computedPropertyNames16_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames16_ES5.js
@@ -69,4 +69,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames17_ES5.js b/tests/baselines/reference/computedPropertyNames17_ES5.js
index 3b5c100694d96..30b14ad523ecd 100644
--- a/tests/baselines/reference/computedPropertyNames17_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames17_ES5.js
@@ -45,4 +45,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames21_ES5.js b/tests/baselines/reference/computedPropertyNames21_ES5.js
index 81f95cd824d20..655de136c349c 100644
--- a/tests/baselines/reference/computedPropertyNames21_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames21_ES5.js
@@ -15,4 +15,4 @@ var C = (function () {
     };
     C.prototype[this.bar()] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames22_ES5.js b/tests/baselines/reference/computedPropertyNames22_ES5.js
index e82bf673b52f1..5448f4dcf8d1b 100644
--- a/tests/baselines/reference/computedPropertyNames22_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames22_ES5.js
@@ -21,4 +21,4 @@ var C = (function () {
         var _a;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames23_ES5.js b/tests/baselines/reference/computedPropertyNames23_ES5.js
index 8e42a29f7e72c..666807f9f8ef6 100644
--- a/tests/baselines/reference/computedPropertyNames23_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames23_ES5.js
@@ -18,4 +18,4 @@ var C = (function () {
     C.prototype[(_a = {}, _a[this.bar()] = 1, _a)[0]] = function () { };
     return C;
     var _a;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames24_ES5.js b/tests/baselines/reference/computedPropertyNames24_ES5.js
index 5a4b79cf44acf..24cfe77d93cdf 100644
--- a/tests/baselines/reference/computedPropertyNames24_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames24_ES5.js
@@ -21,7 +21,7 @@ var Base = (function () {
         return 0;
     };
     return Base;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -29,4 +29,4 @@ var C = (function (_super) {
     }
     C.prototype[_super.bar.call(this)] = function () { };
     return C;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/computedPropertyNames25_ES5.js b/tests/baselines/reference/computedPropertyNames25_ES5.js
index 832fad174d8a7..f38ac0b2e0d30 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames25_ES5.js
@@ -26,7 +26,7 @@ var Base = (function () {
         return 0;
     };
     return Base;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -41,4 +41,4 @@ var C = (function (_super) {
         var _a;
     };
     return C;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/computedPropertyNames26_ES5.js b/tests/baselines/reference/computedPropertyNames26_ES5.js
index 09a954194808b..41a20ac6477f3 100644
--- a/tests/baselines/reference/computedPropertyNames26_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames26_ES5.js
@@ -23,7 +23,7 @@ var Base = (function () {
         return 0;
     };
     return Base;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -32,4 +32,4 @@ var C = (function (_super) {
     C.prototype[(_a = {}, _a[_super.bar.call(this)] = 1, _a)[0]] = function () { };
     return C;
     var _a;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/computedPropertyNames27_ES5.js b/tests/baselines/reference/computedPropertyNames27_ES5.js
index 53e2c2988c854..bdef47165b19f 100644
--- a/tests/baselines/reference/computedPropertyNames27_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames27_ES5.js
@@ -15,7 +15,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -23,4 +23,4 @@ var C = (function (_super) {
     }
     C.prototype[(_super.call(this), "prop")] = function () { };
     return C;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/computedPropertyNames28_ES5.js b/tests/baselines/reference/computedPropertyNames28_ES5.js
index be79f22c2da15..b5b1fdf77aab7 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames28_ES5.js
@@ -20,7 +20,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -32,4 +32,4 @@ var C = (function (_super) {
         var _a;
     }
     return C;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/computedPropertyNames29_ES5.js b/tests/baselines/reference/computedPropertyNames29_ES5.js
index 4682ae9105eea..46ba529d7a546 100644
--- a/tests/baselines/reference/computedPropertyNames29_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames29_ES5.js
@@ -26,4 +26,4 @@ var C = (function () {
         return 0;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames2_ES5.js b/tests/baselines/reference/computedPropertyNames2_ES5.js
index 581b581d87be1..9211fccb530fd 100644
--- a/tests/baselines/reference/computedPropertyNames2_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames2_ES5.js
@@ -39,4 +39,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames30_ES5.js b/tests/baselines/reference/computedPropertyNames30_ES5.js
index de60b5daf5391..e787689d3938c 100644
--- a/tests/baselines/reference/computedPropertyNames30_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames30_ES5.js
@@ -25,7 +25,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -42,4 +42,4 @@ var C = (function (_super) {
         });
     }
     return C;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/computedPropertyNames31_ES5.js b/tests/baselines/reference/computedPropertyNames31_ES5.js
index f8e34603305ca..8417f103fb77b 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames31_ES5.js
@@ -28,7 +28,7 @@ var Base = (function () {
         return 0;
     };
     return Base;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -46,4 +46,4 @@ var C = (function (_super) {
         return 0;
     };
     return C;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/computedPropertyNames32_ES5.js b/tests/baselines/reference/computedPropertyNames32_ES5.js
index a0d8b066b5c5e..1ae07d37e4237 100644
--- a/tests/baselines/reference/computedPropertyNames32_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames32_ES5.js
@@ -17,4 +17,4 @@ var C = (function () {
     };
     C.prototype[foo()] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames33_ES5.js b/tests/baselines/reference/computedPropertyNames33_ES5.js
index 38029893bb165..8db62818e22ce 100644
--- a/tests/baselines/reference/computedPropertyNames33_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames33_ES5.js
@@ -23,4 +23,4 @@ var C = (function () {
         var _a;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames34_ES5.js b/tests/baselines/reference/computedPropertyNames34_ES5.js
index 4e5790c53b108..fa0af2897f7fa 100644
--- a/tests/baselines/reference/computedPropertyNames34_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames34_ES5.js
@@ -23,4 +23,4 @@ var C = (function () {
         var _a;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames36_ES5.js b/tests/baselines/reference/computedPropertyNames36_ES5.js
index 4bb10ea754395..884e425e25b20 100644
--- a/tests/baselines/reference/computedPropertyNames36_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames36_ES5.js
@@ -15,12 +15,12 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -32,4 +32,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames37_ES5.js b/tests/baselines/reference/computedPropertyNames37_ES5.js
index c2a346608fe79..8cdc0af30e729 100644
--- a/tests/baselines/reference/computedPropertyNames37_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames37_ES5.js
@@ -15,12 +15,12 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -32,4 +32,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames38_ES5.js b/tests/baselines/reference/computedPropertyNames38_ES5.js
index 49af4d00d51de..0bc1a4521e84f 100644
--- a/tests/baselines/reference/computedPropertyNames38_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames38_ES5.js
@@ -15,12 +15,12 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -36,4 +36,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames39_ES5.js b/tests/baselines/reference/computedPropertyNames39_ES5.js
index 1b8d3aab2ff42..446a9a6fd77b6 100644
--- a/tests/baselines/reference/computedPropertyNames39_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames39_ES5.js
@@ -15,12 +15,12 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -36,4 +36,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames3_ES5.js b/tests/baselines/reference/computedPropertyNames3_ES5.js
index f5a063f91e6b8..94821a6597401 100644
--- a/tests/baselines/reference/computedPropertyNames3_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames3_ES5.js
@@ -37,4 +37,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames40_ES5.js b/tests/baselines/reference/computedPropertyNames40_ES5.js
index e806376202602..a291349d0cff9 100644
--- a/tests/baselines/reference/computedPropertyNames40_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames40_ES5.js
@@ -15,12 +15,12 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -28,4 +28,4 @@ var C = (function () {
     C.prototype[""] = function () { return new Foo; };
     C.prototype[""] = function () { return new Foo2; };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames41_ES5.js b/tests/baselines/reference/computedPropertyNames41_ES5.js
index 7d7c390bf3e54..cad02361496bb 100644
--- a/tests/baselines/reference/computedPropertyNames41_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames41_ES5.js
@@ -14,16 +14,16 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var C = (function () {
     function C() {
     }
     // Computed properties
     C[""] = function () { return new Foo; };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames42_ES5.js b/tests/baselines/reference/computedPropertyNames42_ES5.js
index f4fda8fc82925..1e1dfff227ba3 100644
--- a/tests/baselines/reference/computedPropertyNames42_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames42_ES5.js
@@ -14,14 +14,14 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNames43_ES5.js b/tests/baselines/reference/computedPropertyNames43_ES5.js
index 57026c3c70694..9690d0b8196bb 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames43_ES5.js
@@ -22,17 +22,17 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -46,4 +46,4 @@ var D = (function (_super) {
         configurable: true
     });
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/computedPropertyNames44_ES5.js b/tests/baselines/reference/computedPropertyNames44_ES5.js
index 1186f0caef7fa..78e20a7d6a3d4 100644
--- a/tests/baselines/reference/computedPropertyNames44_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames44_ES5.js
@@ -21,12 +21,12 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -36,7 +36,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -48,4 +48,4 @@ var D = (function (_super) {
         configurable: true
     });
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/computedPropertyNames45_ES5.js b/tests/baselines/reference/computedPropertyNames45_ES5.js
index ce948e58208f1..9c7482a471393 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames45_ES5.js
@@ -22,12 +22,12 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -37,7 +37,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -49,4 +49,4 @@ var D = (function (_super) {
         configurable: true
     });
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js
index 84b92f6c92d82..7becf285b2a28 100644
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit1_ES5.js
@@ -21,7 +21,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 
 
 //// [computedPropertyNamesDeclarationEmit1_ES5.d.ts]
diff --git a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js
index 9847ea8b7efc1..0b665eb1d9aba 100644
--- a/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesDeclarationEmit2_ES5.js
@@ -21,7 +21,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 
 
 //// [computedPropertyNamesDeclarationEmit2_ES5.d.ts]
diff --git a/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js b/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js
index 1470605413abd..5562e1ea73c43 100644
--- a/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesOnOverloads_ES5.js
@@ -15,4 +15,4 @@ var C = (function () {
     }
     C.prototype[methodName] = function (v) { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js
index 5b99f53400282..5c4be60bc6ed4 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js
@@ -13,5 +13,5 @@ var C = (function () {
         debugger;
     };
     return C;
-})();
+}());
 //# sourceMappingURL=computedPropertyNamesSourceMap1_ES5.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt
index 53dce3e574c1f..3a64433a7092a 100644
--- a/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt
+++ b/tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt
@@ -81,7 +81,7 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 13) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/concatClassAndString.js b/tests/baselines/reference/concatClassAndString.js
index dca09ec7e5822..a26a0803f0175 100644
--- a/tests/baselines/reference/concatClassAndString.js
+++ b/tests/baselines/reference/concatClassAndString.js
@@ -11,5 +11,5 @@ var f = (function () {
     function f() {
     }
     return f;
-})();
+}());
 f += '';
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js
index b2830e4d1d68f..9d90b568d49d9 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js
+++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.js
@@ -83,7 +83,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 ;
 //Cond is an object type variable
 condObject ? exprAny1 : exprAny2;
diff --git a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
index a493a5cfab099..3514965f1cebc 100644
--- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
@@ -58,7 +58,7 @@ var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 ;
 var A = (function (_super) {
     __extends(A, _super);
@@ -66,7 +66,7 @@ var A = (function (_super) {
         _super.apply(this, arguments);
     }
     return A;
-})(X);
+}(X));
 ;
 var B = (function (_super) {
     __extends(B, _super);
@@ -74,7 +74,7 @@ var B = (function (_super) {
         _super.apply(this, arguments);
     }
     return B;
-})(X);
+}(X));
 ;
 var x;
 var a;
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
index 3d75eb0507a48..8780c92fc1e80 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
@@ -34,7 +34,7 @@ var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 ;
 var A = (function (_super) {
     __extends(A, _super);
@@ -42,7 +42,7 @@ var A = (function (_super) {
         _super.apply(this, arguments);
     }
     return A;
-})(X);
+}(X));
 ;
 var B = (function (_super) {
     __extends(B, _super);
@@ -50,7 +50,7 @@ var B = (function (_super) {
         _super.apply(this, arguments);
     }
     return B;
-})(X);
+}(X));
 ;
 var x;
 var a;
diff --git a/tests/baselines/reference/conflictMarkerTrivia1.js b/tests/baselines/reference/conflictMarkerTrivia1.js
index 68f1b82d38b8f..8d0354f98239d 100644
--- a/tests/baselines/reference/conflictMarkerTrivia1.js
+++ b/tests/baselines/reference/conflictMarkerTrivia1.js
@@ -13,4 +13,4 @@ var C = (function () {
         this.v = 1;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/conflictMarkerTrivia2.js b/tests/baselines/reference/conflictMarkerTrivia2.js
index bbf6726b994e4..1e58addf706de 100644
--- a/tests/baselines/reference/conflictMarkerTrivia2.js
+++ b/tests/baselines/reference/conflictMarkerTrivia2.js
@@ -22,4 +22,4 @@ var C = (function () {
     };
     C.prototype.bar = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.js b/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.js
index 6f5b898c5ff56..b8d4065abf490 100644
--- a/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.js
+++ b/tests/baselines/reference/constDeclarationShadowedByVarDeclaration3.js
@@ -18,4 +18,4 @@ var Rule = (function () {
         this.name = name;
     }
     return Rule;
-})();
+}());
diff --git a/tests/baselines/reference/constEnumMergingWithValues2.js b/tests/baselines/reference/constEnumMergingWithValues2.js
index fea628fa540a5..07249ddcc5f43 100644
--- a/tests/baselines/reference/constEnumMergingWithValues2.js
+++ b/tests/baselines/reference/constEnumMergingWithValues2.js
@@ -14,6 +14,6 @@ define(["require", "exports"], function (require, exports) {
         function foo() {
         }
         return foo;
-    })();
+    }());
     return foo;
 });
diff --git a/tests/baselines/reference/constantOverloadFunction.js b/tests/baselines/reference/constantOverloadFunction.js
index 45c0fe9ff0a93..09ff39f582e0b 100644
--- a/tests/baselines/reference/constantOverloadFunction.js
+++ b/tests/baselines/reference/constantOverloadFunction.js
@@ -24,7 +24,7 @@ var Base = (function () {
     }
     Base.prototype.foo = function () { };
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
@@ -32,7 +32,7 @@ var Derived1 = (function (_super) {
     }
     Derived1.prototype.bar = function () { };
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
@@ -40,7 +40,7 @@ var Derived2 = (function (_super) {
     }
     Derived2.prototype.baz = function () { };
     return Derived2;
-})(Base);
+}(Base));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3() {
@@ -48,7 +48,7 @@ var Derived3 = (function (_super) {
     }
     Derived3.prototype.biz = function () { };
     return Derived3;
-})(Base);
+}(Base));
 function foo(tagName) {
     return null;
 }
diff --git a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
index 946f81963725e..37c1b1737cd99 100644
--- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
+++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
@@ -25,7 +25,7 @@ var Base = (function () {
     }
     Base.prototype.foo = function () { };
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
@@ -33,7 +33,7 @@ var Derived1 = (function (_super) {
     }
     Derived1.prototype.bar = function () { };
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
@@ -41,7 +41,7 @@ var Derived2 = (function (_super) {
     }
     Derived2.prototype.baz = function () { };
     return Derived2;
-})(Base);
+}(Base));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3() {
@@ -49,7 +49,7 @@ var Derived3 = (function (_super) {
     }
     Derived3.prototype.biz = function () { };
     return Derived3;
-})(Base);
+}(Base));
 function foo(tagName) {
     return null;
 }
diff --git a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
index 9cf9d71f7a2be..4fd63cf60d0d8 100644
--- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
+++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
@@ -31,19 +31,19 @@ var Constraint = (function () {
     }
     Constraint.prototype.method = function () { };
     return Constraint;
-})();
+}());
 var GenericBase = (function () {
     function GenericBase() {
     }
     return GenericBase;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(GenericBase);
+}(GenericBase));
 var TypeArg = (function () {
     function TypeArg() {
     }
@@ -51,9 +51,9 @@ var TypeArg = (function () {
         Container.People.items;
     };
     return TypeArg;
-})();
+}());
 var Container = (function () {
     function Container() {
     }
     return Container;
-})();
+}());
diff --git a/tests/baselines/reference/constraintSatisfactionWithAny.js b/tests/baselines/reference/constraintSatisfactionWithAny.js
index 06d8b17690a99..6655a10ca45e9 100644
--- a/tests/baselines/reference/constraintSatisfactionWithAny.js
+++ b/tests/baselines/reference/constraintSatisfactionWithAny.js
@@ -76,7 +76,7 @@ var C = (function () {
         this.x = x;
     }
     return C;
-})();
+}());
 var c1 = new C(a);
 var c2 = new C(b);
 var C2 = (function () {
@@ -84,7 +84,7 @@ var C2 = (function () {
         this.x = x;
     }
     return C2;
-})();
+}());
 var c3 = new C2(a);
 var c4 = new C2(b);
 //class C3<T extends T[]> {
@@ -97,6 +97,6 @@ var C4 = (function () {
         this.x = x;
     }
     return C4;
-})();
+}());
 var c7 = new C4(a);
 var c8 = new C4(b);
diff --git a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js
index 7850b0ebd01f5..2886e26dd6637 100644
--- a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js
+++ b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.js
@@ -49,7 +49,7 @@ var C = (function () {
         this.x = x;
     }
     return C;
-})();
+}());
 var r2 = new C({});
 var i;
 // {} constraint
@@ -62,6 +62,6 @@ var C2 = (function () {
         this.x = x;
     }
     return C2;
-})();
+}());
 var r2 = new C2({});
 var i2;
diff --git a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.js b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.js
index f137ac6baa074..15afabfe2513a 100644
--- a/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.js
+++ b/tests/baselines/reference/constraintsThatReferenceOtherContstraints1.js
@@ -14,10 +14,10 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var x; // Error 2 Type '{ a: string; b: number; }' does not satisfy the constraint 'T' for type 
diff --git a/tests/baselines/reference/constraintsUsedInPrototypeProperty.js b/tests/baselines/reference/constraintsUsedInPrototypeProperty.js
index 7f055e519c3d0..89ba3d0efa97b 100644
--- a/tests/baselines/reference/constraintsUsedInPrototypeProperty.js
+++ b/tests/baselines/reference/constraintsUsedInPrototypeProperty.js
@@ -7,5 +7,5 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 Foo.prototype; // Foo<any, any, any>
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
index 38b7b7fc19451..88f35f53b175d 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
@@ -80,25 +80,25 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
index 7d07c1a1712b3..96318a0d61604 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
@@ -125,26 +125,26 @@ var Errors;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
             _super.apply(this, arguments);
         }
         return Derived;
-    })(Base);
+    }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
             _super.apply(this, arguments);
         }
         return Derived2;
-    })(Derived);
+    }(Derived));
     var OtherDerived = (function (_super) {
         __extends(OtherDerived, _super);
         function OtherDerived() {
             _super.apply(this, arguments);
         }
         return OtherDerived;
-    })(Base);
+    }(Base));
 })(Errors || (Errors = {}));
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
index ba341eec61f56..171c4bc6210fe 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
@@ -70,25 +70,25 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
index 304b5cafd66ab..26757c43defce 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
@@ -60,25 +60,25 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
index 99c885f9716ef..ae1d0d904454b 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
@@ -63,25 +63,25 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.js b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.js
index f31d662d87124..89de89c4fca74 100644
--- a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.js
+++ b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters.js
@@ -37,18 +37,18 @@ var C = (function () {
         this.y = y;
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2(x) {
         this.x = x;
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3(x) {
         this.x = x;
     }
     return C3;
-})();
+}());
 var a;
 var b;
diff --git a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.js b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.js
index 26abb6448f991..c58b8ed003e3f 100644
--- a/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.js
+++ b/tests/baselines/reference/constructSignatureWithAccessibilityModifiersOnParameters2.js
@@ -44,18 +44,18 @@ var C = (function () {
         this.y = y;
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2(x) {
         this.x = x;
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3(y) {
         this.y = y;
     }
     return C3;
-})();
+}());
 var a;
 var b;
diff --git a/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.js b/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.js
index 92528d6635c7e..f2dc1d2357e2e 100644
--- a/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.js
+++ b/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.js
@@ -55,13 +55,13 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
 var r1 = new C(1, '');
 var C2 = (function () {
     function C2(x) {
     }
     return C2;
-})();
+}());
 var r2 = new C2(1, '');
 var i;
 var r3 = new i(1, '');
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads.js b/tests/baselines/reference/constructSignaturesWithOverloads.js
index 1ee6290aeec8a..999ea15656814 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads.js
+++ b/tests/baselines/reference/constructSignaturesWithOverloads.js
@@ -56,13 +56,13 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
 var r1 = new C(1, '');
 var C2 = (function () {
     function C2(x) {
     }
     return C2;
-})();
+}());
 var r2 = new C2(1, '');
 var i;
 var r3 = new i(1, '');
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads2.js b/tests/baselines/reference/constructSignaturesWithOverloads2.js
index 642cac9f3647a..eae1b358dcc1b 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads2.js
+++ b/tests/baselines/reference/constructSignaturesWithOverloads2.js
@@ -46,7 +46,7 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
 var C;
 (function (C) {
     C.x = 1;
@@ -56,7 +56,7 @@ var C2 = (function () {
     function C2(x) {
     }
     return C2;
-})();
+}());
 var C2;
 (function (C2) {
     C2.x = 1;
diff --git a/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.js b/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.js
index 1ef6884816d9b..1593a37876483 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.js
+++ b/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.js
@@ -38,11 +38,11 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2(x, y) {
     }
     return C2;
-})();
+}());
 var a;
 var b;
diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.js b/tests/baselines/reference/constructorArgWithGenericCallSignature.js
index ca8598698504f..c299bba6c91e8 100644
--- a/tests/baselines/reference/constructorArgWithGenericCallSignature.js
+++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.js
@@ -21,7 +21,7 @@ var Test;
         function MyClass(func) {
         }
         return MyClass;
-    })();
+    }());
     Test.MyClass = MyClass;
     function F(func) { }
     Test.F = F;
diff --git a/tests/baselines/reference/constructorArgs.js b/tests/baselines/reference/constructorArgs.js
index 6fc3511b70e80..1d533506e1531 100644
--- a/tests/baselines/reference/constructorArgs.js
+++ b/tests/baselines/reference/constructorArgs.js
@@ -25,7 +25,7 @@ var Super = (function () {
     function Super(value) {
     }
     return Super;
-})();
+}());
 var Sub = (function (_super) {
     __extends(Sub, _super);
     function Sub(options) {
@@ -33,4 +33,4 @@ var Sub = (function (_super) {
         this.options = options;
     }
     return Sub;
-})(Super);
+}(Super));
diff --git a/tests/baselines/reference/constructorArgsErrors1.js b/tests/baselines/reference/constructorArgsErrors1.js
index 25701901e1372..bb0725ab8b9b3 100644
--- a/tests/baselines/reference/constructorArgsErrors1.js
+++ b/tests/baselines/reference/constructorArgsErrors1.js
@@ -9,4 +9,4 @@ var foo = (function () {
     function foo(a) {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/constructorArgsErrors2.js b/tests/baselines/reference/constructorArgsErrors2.js
index a0cab9f39f887..5650c64c96d3f 100644
--- a/tests/baselines/reference/constructorArgsErrors2.js
+++ b/tests/baselines/reference/constructorArgsErrors2.js
@@ -11,4 +11,4 @@ var foo = (function () {
         this.a = a;
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/constructorArgsErrors3.js b/tests/baselines/reference/constructorArgsErrors3.js
index 3f9b09254a195..4d7d36a02c519 100644
--- a/tests/baselines/reference/constructorArgsErrors3.js
+++ b/tests/baselines/reference/constructorArgsErrors3.js
@@ -11,4 +11,4 @@ var foo = (function () {
         this.a = a;
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/constructorArgsErrors4.js b/tests/baselines/reference/constructorArgsErrors4.js
index c0646a54148b9..558cb6e68decd 100644
--- a/tests/baselines/reference/constructorArgsErrors4.js
+++ b/tests/baselines/reference/constructorArgsErrors4.js
@@ -11,4 +11,4 @@ var foo = (function () {
         this.a = a;
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/constructorArgsErrors5.js b/tests/baselines/reference/constructorArgsErrors5.js
index 3455490aa6fab..c481d6f323c6c 100644
--- a/tests/baselines/reference/constructorArgsErrors5.js
+++ b/tests/baselines/reference/constructorArgsErrors5.js
@@ -10,4 +10,4 @@ var foo = (function () {
     function foo(a) {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/constructorDefaultValuesReferencingThis.js b/tests/baselines/reference/constructorDefaultValuesReferencingThis.js
index e022f46a5283e..5bc75012f7d6e 100644
--- a/tests/baselines/reference/constructorDefaultValuesReferencingThis.js
+++ b/tests/baselines/reference/constructorDefaultValuesReferencingThis.js
@@ -17,17 +17,17 @@ var C = (function () {
         if (x === void 0) { x = this; }
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x) {
         if (x === void 0) { x = this; }
     }
     return D;
-})();
+}());
 var E = (function () {
     function E(x) {
         if (x === void 0) { x = this; }
         this.x = x;
     }
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
index 305b3e54eadea..d06faa80f2004 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
@@ -29,18 +29,18 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
index b2bf377f0cc6a..1c3d6bf16d0f4 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
@@ -43,14 +43,14 @@ var Base = (function () {
     function Base(x) {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived(x) {
         _super.call(this, x);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     // ok, not enforcing assignability relation on this
@@ -59,4 +59,4 @@ var Derived2 = (function (_super) {
         return 1;
     }
     return Derived2;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.js b/tests/baselines/reference/constructorHasPrototypeProperty.js
index a1bdee8e7d4e4..960b76f52c446 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.js
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.js
@@ -43,14 +43,14 @@ var NonGeneric;
         function C() {
         }
         return C;
-    })();
+    }());
     var D = (function (_super) {
         __extends(D, _super);
         function D() {
             _super.apply(this, arguments);
         }
         return D;
-    })(C);
+    }(C));
     var r = C.prototype;
     r.foo;
     var r2 = D.prototype;
@@ -62,14 +62,14 @@ var Generic;
         function C() {
         }
         return C;
-    })();
+    }());
     var D = (function (_super) {
         __extends(D, _super);
         function D() {
             _super.apply(this, arguments);
         }
         return D;
-    })(C);
+    }(C));
     var r = C.prototype; // C<any, any>
     var ra = r.foo; // any
     var r2 = D.prototype; // D<any, any>
diff --git a/tests/baselines/reference/constructorImplementationWithDefaultValues.js b/tests/baselines/reference/constructorImplementationWithDefaultValues.js
index 2279b13f21dfb..607ffb1e30bc1 100644
--- a/tests/baselines/reference/constructorImplementationWithDefaultValues.js
+++ b/tests/baselines/reference/constructorImplementationWithDefaultValues.js
@@ -27,18 +27,18 @@ var C = (function () {
         var y = x;
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x) {
         if (x === void 0) { x = null; }
         var y = x;
     }
     return D;
-})();
+}());
 var E = (function () {
     function E(x) {
         if (x === void 0) { x = null; }
         var y = x;
     }
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/constructorImplementationWithDefaultValues2.js b/tests/baselines/reference/constructorImplementationWithDefaultValues2.js
index 217a8287f14f2..b0ca55b650442 100644
--- a/tests/baselines/reference/constructorImplementationWithDefaultValues2.js
+++ b/tests/baselines/reference/constructorImplementationWithDefaultValues2.js
@@ -28,7 +28,7 @@ var C = (function () {
         var y = x;
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x, y) {
         if (x === void 0) { x = 1; }
@@ -37,11 +37,11 @@ var D = (function () {
         var z = x;
     }
     return D;
-})();
+}());
 var E = (function () {
     function E(x) {
         if (x === void 0) { x = new Date(); }
         var y = x;
     }
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.js b/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.js
index e43276dfef122..6bc52392e1c37 100644
--- a/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.js
+++ b/tests/baselines/reference/constructorInvocationWithTooFewTypeArgs.js
@@ -15,5 +15,5 @@ var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var d = new D();
diff --git a/tests/baselines/reference/constructorOverloads1.js b/tests/baselines/reference/constructorOverloads1.js
index 97f33dca8629e..47906974f6ea5 100644
--- a/tests/baselines/reference/constructorOverloads1.js
+++ b/tests/baselines/reference/constructorOverloads1.js
@@ -28,7 +28,7 @@ var Foo = (function () {
     Foo.prototype.bar1 = function () { };
     Foo.prototype.bar2 = function () { };
     return Foo;
-})();
+}());
 var f1 = new Foo("hey");
 var f2 = new Foo(0);
 var f3 = new Foo(f1);
diff --git a/tests/baselines/reference/constructorOverloads2.js b/tests/baselines/reference/constructorOverloads2.js
index d95477d84f6af..76481ec1bc691 100644
--- a/tests/baselines/reference/constructorOverloads2.js
+++ b/tests/baselines/reference/constructorOverloads2.js
@@ -36,7 +36,7 @@ var FooBase = (function () {
     }
     FooBase.prototype.bar1 = function () { };
     return FooBase;
-})();
+}());
 var Foo = (function (_super) {
     __extends(Foo, _super);
     function Foo(x, y) {
@@ -44,7 +44,7 @@ var Foo = (function (_super) {
     }
     Foo.prototype.bar1 = function () { };
     return Foo;
-})(FooBase);
+}(FooBase));
 var f1 = new Foo("hey");
 var f2 = new Foo(0);
 var f3 = new Foo(f1);
diff --git a/tests/baselines/reference/constructorOverloads3.js b/tests/baselines/reference/constructorOverloads3.js
index c7e4e411319e9..61f0d50db03af 100644
--- a/tests/baselines/reference/constructorOverloads3.js
+++ b/tests/baselines/reference/constructorOverloads3.js
@@ -34,7 +34,7 @@ var Foo = (function (_super) {
     }
     Foo.prototype.bar1 = function () { };
     return Foo;
-})(FooBase);
+}(FooBase));
 var f1 = new Foo("hey");
 var f2 = new Foo(0);
 var f3 = new Foo(f1);
diff --git a/tests/baselines/reference/constructorOverloads8.js b/tests/baselines/reference/constructorOverloads8.js
index 6fc51494abacf..f1185b6ab76b5 100644
--- a/tests/baselines/reference/constructorOverloads8.js
+++ b/tests/baselines/reference/constructorOverloads8.js
@@ -20,9 +20,9 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x) {
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/constructorOverloadsWithDefaultValues.js b/tests/baselines/reference/constructorOverloadsWithDefaultValues.js
index 9e5ffe7388ea8..78a5d33769071 100644
--- a/tests/baselines/reference/constructorOverloadsWithDefaultValues.js
+++ b/tests/baselines/reference/constructorOverloadsWithDefaultValues.js
@@ -18,9 +18,9 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/constructorOverloadsWithOptionalParameters.js b/tests/baselines/reference/constructorOverloadsWithOptionalParameters.js
index 183bc4eda01ea..b251a5f88ce3b 100644
--- a/tests/baselines/reference/constructorOverloadsWithOptionalParameters.js
+++ b/tests/baselines/reference/constructorOverloadsWithOptionalParameters.js
@@ -18,9 +18,9 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/constructorParameterProperties.js b/tests/baselines/reference/constructorParameterProperties.js
index 11446a316d39d..17c6fdaddcd82 100644
--- a/tests/baselines/reference/constructorParameterProperties.js
+++ b/tests/baselines/reference/constructorParameterProperties.js
@@ -28,7 +28,7 @@ var C = (function () {
         this.z = z;
     }
     return C;
-})();
+}());
 var c;
 var r = c.y;
 var r2 = c.x; // error
@@ -39,7 +39,7 @@ var D = (function () {
         this.z = z;
     }
     return D;
-})();
+}());
 var d;
 var r = d.y;
 var r2 = d.x; // error
diff --git a/tests/baselines/reference/constructorParameterProperties2.js b/tests/baselines/reference/constructorParameterProperties2.js
index 02e4cf82c8403..c740fc9fd3040 100644
--- a/tests/baselines/reference/constructorParameterProperties2.js
+++ b/tests/baselines/reference/constructorParameterProperties2.js
@@ -37,7 +37,7 @@ var C = (function () {
     function C(y) {
     } // ok
     return C;
-})();
+}());
 var c;
 var r = c.y;
 var D = (function () {
@@ -45,7 +45,7 @@ var D = (function () {
         this.y = y;
     } // error
     return D;
-})();
+}());
 var d;
 var r2 = d.y;
 var E = (function () {
@@ -53,7 +53,7 @@ var E = (function () {
         this.y = y;
     } // error
     return E;
-})();
+}());
 var e;
 var r3 = e.y; // error
 var F = (function () {
@@ -61,6 +61,6 @@ var F = (function () {
         this.y = y;
     } // error
     return F;
-})();
+}());
 var f;
 var r4 = f.y; // error
diff --git a/tests/baselines/reference/constructorParameterShadowsOuterScopes.js b/tests/baselines/reference/constructorParameterShadowsOuterScopes.js
index 18a1891c92709..aa6612828fa2d 100644
--- a/tests/baselines/reference/constructorParameterShadowsOuterScopes.js
+++ b/tests/baselines/reference/constructorParameterShadowsOuterScopes.js
@@ -32,7 +32,7 @@ var C = (function () {
         x = 2; // error, x is string
     }
     return C;
-})();
+}());
 var y = 1;
 var D = (function () {
     function D(x) {
@@ -40,4 +40,4 @@ var D = (function () {
         var y = "";
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/constructorParametersInVariableDeclarations.js b/tests/baselines/reference/constructorParametersInVariableDeclarations.js
index 984c8c392b133..659b4ea98fc46 100644
--- a/tests/baselines/reference/constructorParametersInVariableDeclarations.js
+++ b/tests/baselines/reference/constructorParametersInVariableDeclarations.js
@@ -24,7 +24,7 @@ var A = (function () {
         this.c = function () { return x; };
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
         this.a = x;
@@ -33,4 +33,4 @@ var B = (function () {
         var x = 1;
     }
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/constructorParametersThatShadowExternalNamesInVariableDeclarations.js b/tests/baselines/reference/constructorParametersThatShadowExternalNamesInVariableDeclarations.js
index 9e86b185fbdc0..1bcf24ee4c3a7 100644
--- a/tests/baselines/reference/constructorParametersThatShadowExternalNamesInVariableDeclarations.js
+++ b/tests/baselines/reference/constructorParametersThatShadowExternalNamesInVariableDeclarations.js
@@ -20,11 +20,11 @@ var A = (function () {
         this.a = x;
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
         this.a = x;
         var x = "";
     }
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/constructorReturningAPrimitive.js b/tests/baselines/reference/constructorReturningAPrimitive.js
index 04308590a6094..297c9954f55ec 100644
--- a/tests/baselines/reference/constructorReturningAPrimitive.js
+++ b/tests/baselines/reference/constructorReturningAPrimitive.js
@@ -27,7 +27,7 @@ var A = (function () {
         return 1;
     }
     return A;
-})();
+}());
 var a = new A();
 var B = (function () {
     function B() {
@@ -35,5 +35,5 @@ var B = (function () {
         return x;
     }
     return B;
-})();
+}());
 var b = new B();
diff --git a/tests/baselines/reference/constructorReturnsInvalidType.js b/tests/baselines/reference/constructorReturnsInvalidType.js
index 7f6119cc8bd93..82c5cc4a76095 100644
--- a/tests/baselines/reference/constructorReturnsInvalidType.js
+++ b/tests/baselines/reference/constructorReturnsInvalidType.js
@@ -16,5 +16,5 @@ var X = (function () {
     }
     X.prototype.foo = function () { };
     return X;
-})();
+}());
 var x = new X();
diff --git a/tests/baselines/reference/constructorStaticParamName.js b/tests/baselines/reference/constructorStaticParamName.js
index cf74aed2ebcf8..9520a7c052cf7 100644
--- a/tests/baselines/reference/constructorStaticParamName.js
+++ b/tests/baselines/reference/constructorStaticParamName.js
@@ -12,4 +12,4 @@ var test = (function () {
     function test(static) {
     }
     return test;
-})();
+}());
diff --git a/tests/baselines/reference/constructorStaticParamNameErrors.js b/tests/baselines/reference/constructorStaticParamNameErrors.js
index 43e70a8c3cf2c..91d405efd2837 100644
--- a/tests/baselines/reference/constructorStaticParamNameErrors.js
+++ b/tests/baselines/reference/constructorStaticParamNameErrors.js
@@ -12,4 +12,4 @@ var test = (function () {
     function test(static) {
     }
     return test;
-})();
+}());
diff --git a/tests/baselines/reference/constructorWithAssignableReturnExpression.js b/tests/baselines/reference/constructorWithAssignableReturnExpression.js
index 238f2e18aea52..d691dd2b511e0 100644
--- a/tests/baselines/reference/constructorWithAssignableReturnExpression.js
+++ b/tests/baselines/reference/constructorWithAssignableReturnExpression.js
@@ -42,28 +42,28 @@ var C = (function () {
         return 1;
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
         return 1; // error
     }
     return D;
-})();
+}());
 var E = (function () {
     function E() {
         return { x: 1 };
     }
     return E;
-})();
+}());
 var F = (function () {
     function F() {
         return { x: 1 }; // error
     }
     return F;
-})();
+}());
 var G = (function () {
     function G() {
         return { x: null };
     }
     return G;
-})();
+}());
diff --git a/tests/baselines/reference/constructorWithExpressionLessReturn.js b/tests/baselines/reference/constructorWithExpressionLessReturn.js
index c0074bdecfbde..8bf0e2f8de0ea 100644
--- a/tests/baselines/reference/constructorWithExpressionLessReturn.js
+++ b/tests/baselines/reference/constructorWithExpressionLessReturn.js
@@ -30,24 +30,24 @@ var C = (function () {
         return;
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
         return;
     }
     return D;
-})();
+}());
 var E = (function () {
     function E(x) {
         this.x = x;
         return;
     }
     return E;
-})();
+}());
 var F = (function () {
     function F(x) {
         this.x = x;
         return;
     }
     return F;
-})();
+}());
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
index 4765d1de28344..905c12e07e34b 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
@@ -331,7 +331,7 @@ var TypeScriptAllInOne;
             console.log(e);
         };
         return Program;
-    })();
+    }());
     TypeScriptAllInOne.Program = Program;
     try {
     }
@@ -484,7 +484,7 @@ var BasicFeatures = (function () {
             return 1;
     };
     return BasicFeatures;
-})();
+}());
 var CLASS = (function () {
     function CLASS() {
         this.d = function () { yield 0; };
@@ -507,13 +507,13 @@ var CLASS = (function () {
             return false;
     };
     return CLASS;
-})();
+}());
 // todo: use these
 var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 method1(val, number);
 {
     return val;
@@ -531,13 +531,13 @@ var B = (function (_super) {
         return this.method1(2);
     };
     return B;
-})(A);
+}(A));
 var Overloading = (function () {
     function Overloading() {
         this.otherValue = 42;
     }
     return Overloading;
-})();
+}());
 Overloads(value, string);
 Overloads();
 while ()
diff --git a/tests/baselines/reference/constructorsWithSpecializedSignatures.js b/tests/baselines/reference/constructorsWithSpecializedSignatures.js
index 4faa5e4030af1..c3a0752ddf8b4 100644
--- a/tests/baselines/reference/constructorsWithSpecializedSignatures.js
+++ b/tests/baselines/reference/constructorsWithSpecializedSignatures.js
@@ -49,10 +49,10 @@ 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/contextualTypeAppliedToVarArgs.js b/tests/baselines/reference/contextualTypeAppliedToVarArgs.js
index 77ce90ec7371b..f8b271ba47cf6 100644
--- a/tests/baselines/reference/contextualTypeAppliedToVarArgs.js
+++ b/tests/baselines/reference/contextualTypeAppliedToVarArgs.js
@@ -30,4 +30,4 @@ var Foo = (function () {
         });
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/contextualTypeWithTuple.js b/tests/baselines/reference/contextualTypeWithTuple.js
index cfcdd13f7d082..4fff51de563c6 100644
--- a/tests/baselines/reference/contextualTypeWithTuple.js
+++ b/tests/baselines/reference/contextualTypeWithTuple.js
@@ -36,12 +36,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var unionTuple = [new C(), "foo"];
 var unionTuple1 = [new C(), "foo"];
 var unionTuple2 = [new C(), "foo", new D()];
diff --git a/tests/baselines/reference/contextualTyping.js b/tests/baselines/reference/contextualTyping.js
index a763b2b65448d..227c6bb1f41eb 100644
--- a/tests/baselines/reference/contextualTyping.js
+++ b/tests/baselines/reference/contextualTyping.js
@@ -240,7 +240,7 @@ var C1T5 = (function () {
         };
     }
     return C1T5;
-})();
+}());
 // CONTEXT: Module property declaration
 var C2T5;
 (function (C2T5) {
@@ -279,7 +279,7 @@ var C4T5 = (function () {
         };
     }
     return C4T5;
-})();
+}());
 // CONTEXT: Module property assignment
 var C5T5;
 (function (C5T5) {
@@ -329,7 +329,7 @@ var C11t5 = (function () {
     function C11t5(f) {
     }
     return C11t5;
-})();
+}());
 ;
 var i = new C11t5(function (n) { return ({}); });
 // CONTEXT: Type annotated expression
diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt
index 3498ec016df93..3557299d96a0b 100644
--- a/tests/baselines/reference/contextualTyping.sourcemap.txt
+++ b/tests/baselines/reference/contextualTyping.sourcemap.txt
@@ -107,7 +107,7 @@ sourceFile:contextualTyping.ts
 1->Emitted(8, 5) Source(18, 1) + SourceIndex(0)
 2 >Emitted(8, 16) Source(18, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -1043,7 +1043,7 @@ sourceFile:contextualTyping.ts
 1->Emitted(47, 5) Source(63, 1) + SourceIndex(0)
 2 >Emitted(47, 16) Source(63, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -2350,7 +2350,7 @@ sourceFile:contextualTyping.ts
 1->Emitted(97, 5) Source(155, 55) + SourceIndex(0)
 2 >Emitted(97, 17) Source(155, 56) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/contextualTyping10.js b/tests/baselines/reference/contextualTyping10.js
index 08a2172b69ae2..cd324b384fd55 100644
--- a/tests/baselines/reference/contextualTyping10.js
+++ b/tests/baselines/reference/contextualTyping10.js
@@ -7,4 +7,4 @@ var foo = (function () {
         this.bar = [{ id: 1 }, { id: 2 }];
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/contextualTyping11.js b/tests/baselines/reference/contextualTyping11.js
index a7ec3815fae70..9abf332c29edb 100644
--- a/tests/baselines/reference/contextualTyping11.js
+++ b/tests/baselines/reference/contextualTyping11.js
@@ -7,4 +7,4 @@ var foo = (function () {
         this.bar = [({})];
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/contextualTyping12.js b/tests/baselines/reference/contextualTyping12.js
index c41ccbed99067..c9ce3e2f964d7 100644
--- a/tests/baselines/reference/contextualTyping12.js
+++ b/tests/baselines/reference/contextualTyping12.js
@@ -7,4 +7,4 @@ var foo = (function () {
         this.bar = [{ id: 1 }, { id: 2, name: "foo" }];
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/contextualTyping14.js b/tests/baselines/reference/contextualTyping14.js
index 5bae8c948a2a8..f29e077eaa2d3 100644
--- a/tests/baselines/reference/contextualTyping14.js
+++ b/tests/baselines/reference/contextualTyping14.js
@@ -7,4 +7,4 @@ var foo = (function () {
         this.bar = function (a) { return a; };
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/contextualTyping15.js b/tests/baselines/reference/contextualTyping15.js
index 250076ec4d5d8..30df3d3d428ac 100644
--- a/tests/baselines/reference/contextualTyping15.js
+++ b/tests/baselines/reference/contextualTyping15.js
@@ -7,4 +7,4 @@ var foo = (function () {
         this.bar = function () { return 1; };
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/contextualTyping3.js b/tests/baselines/reference/contextualTyping3.js
index 19d71f4ca714e..2fc0f330b13a9 100644
--- a/tests/baselines/reference/contextualTyping3.js
+++ b/tests/baselines/reference/contextualTyping3.js
@@ -7,4 +7,4 @@ var foo = (function () {
         this.bar = { id: 5 };
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/contextualTyping4.js b/tests/baselines/reference/contextualTyping4.js
index af79e3732f242..36f7c61429f17 100644
--- a/tests/baselines/reference/contextualTyping4.js
+++ b/tests/baselines/reference/contextualTyping4.js
@@ -7,4 +7,4 @@ var foo = (function () {
         this.bar = { id: 5, name: "foo" };
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/contextualTyping5.js b/tests/baselines/reference/contextualTyping5.js
index 3fcc1530f68bb..f5e68e93b2291 100644
--- a/tests/baselines/reference/contextualTyping5.js
+++ b/tests/baselines/reference/contextualTyping5.js
@@ -7,4 +7,4 @@ var foo = (function () {
         this.bar = {};
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/contextualTypingArrayOfLambdas.js b/tests/baselines/reference/contextualTypingArrayOfLambdas.js
index 59da607079bb2..5775e0f064dbf 100644
--- a/tests/baselines/reference/contextualTypingArrayOfLambdas.js
+++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.js
@@ -24,19 +24,19 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 var xs = [function (x) { }, function (x) { }, function (x) { }];
diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression.js b/tests/baselines/reference/contextualTypingOfConditionalExpression.js
index a0f8ea0a4cfe3..29bb48e797069 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.js
@@ -25,19 +25,19 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 var x2 = true ? function (a) { return a.foo; } : function (b) { return b.foo; };
diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
index 2833ed37d4bf2..1d84d74e5902e 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
@@ -22,19 +22,19 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 var x2 = true ? function (a) { return a.foo; } : function (b) { };
diff --git a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js
index edbe8c4d338b3..11081be4fb356 100644
--- a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js
+++ b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration01.js
@@ -58,7 +58,7 @@ function getFoo1() {
             arg.strProp = "hello";
         };
         return class_1;
-    })();
+    }());
 }
 function getFoo2() {
     return (function () {
@@ -71,7 +71,7 @@ function getFoo2() {
             arg.strProp = "hello";
         };
         return class_2;
-    })();
+    }());
 }
 function getFoo3() {
     return (function () {
@@ -84,5 +84,5 @@ function getFoo3() {
             arg.strProp = "hello";
         };
         return class_3;
-    })();
+    }());
 }
diff --git a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.js b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.js
index 43e9134689fd3..ecd6e3c7dde3c 100644
--- a/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.js
+++ b/tests/baselines/reference/contextuallyTypedClassExpressionMethodDeclaration02.js
@@ -62,7 +62,7 @@ function getFoo1() {
             arg.strProp = "hello";
         };
         return class_1;
-    })();
+    }());
 }
 function getFoo2() {
     return (function () {
@@ -75,7 +75,7 @@ function getFoo2() {
             };
         }
         return class_2;
-    })();
+    }());
 }
 function getFoo3() {
     return (function () {
@@ -88,5 +88,5 @@ function getFoo3() {
             };
         }
         return class_3;
-    })();
+    }());
 }
diff --git a/tests/baselines/reference/convertKeywordsYes.js b/tests/baselines/reference/convertKeywordsYes.js
index a68f751f4349a..ba3c661d1d031 100644
--- a/tests/baselines/reference/convertKeywordsYes.js
+++ b/tests/baselines/reference/convertKeywordsYes.js
@@ -440,7 +440,7 @@ var bigClass = (function () {
         this.with = 0;
     }
     return bigClass;
-})();
+}());
 var bigEnum;
 (function (bigEnum) {
     bigEnum[bigEnum["constructor"] = 0] = "constructor";
@@ -504,70 +504,70 @@ var bigModule;
         function constructor() {
         }
         return constructor;
-    })();
+    }());
     var implements = (function () {
         function implements() {
         }
         return implements;
-    })();
+    }());
     var interface = (function () {
         function interface() {
         }
         return interface;
-    })();
+    }());
     var let = (function () {
         function let() {
         }
         return let;
-    })();
+    }());
     var module = (function () {
         function module() {
         }
         return module;
-    })();
+    }());
     var package = (function () {
         function package() {
         }
         return package;
-    })();
+    }());
     var private = (function () {
         function private() {
         }
         return private;
-    })();
+    }());
     var protected = (function () {
         function protected() {
         }
         return protected;
-    })();
+    }());
     var public = (function () {
         function public() {
         }
         return public;
-    })();
+    }());
     var set = (function () {
         function set() {
         }
         return set;
-    })();
+    }());
     var static = (function () {
         function static() {
         }
         return static;
-    })();
+    }());
     var get = (function () {
         function get() {
         }
         return get;
-    })();
+    }());
     var yield = (function () {
         function yield() {
         }
         return yield;
-    })();
+    }());
     var declare = (function () {
         function declare() {
         }
         return declare;
-    })();
+    }());
 })(bigModule || (bigModule = {}));
diff --git a/tests/baselines/reference/covariance1.js b/tests/baselines/reference/covariance1.js
index bed31338cbe16..eadcd9485b672 100644
--- a/tests/baselines/reference/covariance1.js
+++ b/tests/baselines/reference/covariance1.js
@@ -25,7 +25,7 @@ var M;
             this.m1 = m1;
         }
         return XX;
-    })();
+    }());
     M.XX = XX;
     function f(y) { }
     M.f = f;
diff --git a/tests/baselines/reference/crashInresolveReturnStatement.js b/tests/baselines/reference/crashInresolveReturnStatement.js
index 72ece3c8cfc0a..be2e38ddf49c0 100644
--- a/tests/baselines/reference/crashInresolveReturnStatement.js
+++ b/tests/baselines/reference/crashInresolveReturnStatement.js
@@ -26,7 +26,7 @@ var WorkItemToolbar = (function () {
         WITDialogs.createCopyOfWorkItem();
     };
     return WorkItemToolbar;
-})();
+}());
 var CreateCopyOfWorkItemDialog = (function () {
     function CreateCopyOfWorkItemDialog() {
     }
@@ -34,7 +34,7 @@ var CreateCopyOfWorkItemDialog = (function () {
         return null;
     };
     return CreateCopyOfWorkItemDialog;
-})();
+}());
 function createWorkItemDialog(dialogType) {
 }
 var WITDialogs = (function () {
@@ -44,4 +44,4 @@ var WITDialogs = (function () {
         createWorkItemDialog(CreateCopyOfWorkItemDialog);
     };
     return WITDialogs;
-})();
+}());
diff --git a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
index 332f4897fc71b..c385eff83d5e7 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
@@ -21,14 +21,14 @@ var C = (function () {
         this.x = 1;
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 function foo(x, items) {
     return null;
 }
diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
index 8ae7ccc135487..00f4dbdc3770e 100644
--- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
@@ -20,6 +20,6 @@ define(["require", "exports"], function (require, exports) {
         BuildWorkspaceService.prototype.injectBuildService = function (service) {
         };
         return BuildWorkspaceService;
-    })();
+    }());
     exports.BuildWorkspaceService = BuildWorkspaceService;
 });
diff --git a/tests/baselines/reference/crashOnMethodSignatures.js b/tests/baselines/reference/crashOnMethodSignatures.js
index 8475020f30747..8444eb0280b83 100644
--- a/tests/baselines/reference/crashOnMethodSignatures.js
+++ b/tests/baselines/reference/crashOnMethodSignatures.js
@@ -9,4 +9,4 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/crashRegressionTest.js b/tests/baselines/reference/crashRegressionTest.js
index 6b8067df83c8d..22efbf3fba4ab 100644
--- a/tests/baselines/reference/crashRegressionTest.js
+++ b/tests/baselines/reference/crashRegressionTest.js
@@ -41,14 +41,14 @@ var MsPortal;
                     this._templateStorage.templateSources[this._name] = value;
                 };
                 return StringTemplate;
-            })();
+            }());
             var TemplateStorage = (function () {
                 function TemplateStorage() {
                     this.templateSources = {};
                     this.templateData = {};
                 }
                 return TemplateStorage;
-            })();
+            }());
             TemplateEngine.TemplateStorage = TemplateStorage;
         })(TemplateEngine = Util.TemplateEngine || (Util.TemplateEngine = {}));
     })(Util = MsPortal.Util || (MsPortal.Util = {}));
diff --git a/tests/baselines/reference/createArray.js b/tests/baselines/reference/createArray.js
index 82572e05cad42..8314570c089ab 100644
--- a/tests/baselines/reference/createArray.js
+++ b/tests/baselines/reference/createArray.js
@@ -21,7 +21,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 new C[];
 var ba = new boolean[];
 var sa = new string[];
diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js
index 6c92f5b18d5a4..e3616c79e389f 100644
--- a/tests/baselines/reference/declFileAccessors.js
+++ b/tests/baselines/reference/declFileAccessors.js
@@ -183,7 +183,7 @@ var c1 = (function () {
         configurable: true
     });
     return c1;
-})();
+}());
 exports.c1 = c1;
 //// [declFileAccessors_1.js]
 /** This is comment for c2 - the global class*/
@@ -266,7 +266,7 @@ var c2 = (function () {
         configurable: true
     });
     return c2;
-})();
+}());
 
 
 //// [declFileAccessors_0.d.ts]
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
index 9c0ffc6123bba..e521950832949 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
@@ -14,7 +14,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 exports.Foo = Foo;
 //// [declFileAliasUseBeforeDeclaration_test.js]
 "use strict";
diff --git a/tests/baselines/reference/declFileClassExtendsNull.js b/tests/baselines/reference/declFileClassExtendsNull.js
index 0d50b320592ac..e9081acab55ed 100644
--- a/tests/baselines/reference/declFileClassExtendsNull.js
+++ b/tests/baselines/reference/declFileClassExtendsNull.js
@@ -15,7 +15,7 @@ var ExtendsNull = (function (_super) {
         _super.apply(this, arguments);
     }
     return ExtendsNull;
-})(null);
+}(null));
 
 
 //// [declFileClassExtendsNull.d.ts]
diff --git a/tests/baselines/reference/declFileClassWithIndexSignature.js b/tests/baselines/reference/declFileClassWithIndexSignature.js
index 956bbfe5c46a8..31369db666001 100644
--- a/tests/baselines/reference/declFileClassWithIndexSignature.js
+++ b/tests/baselines/reference/declFileClassWithIndexSignature.js
@@ -9,7 +9,7 @@ var BlockIntrinsics = (function () {
     function BlockIntrinsics() {
     }
     return BlockIntrinsics;
-})();
+}());
 
 
 //// [declFileClassWithIndexSignature.d.ts]
diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
index 1a54642fbd4b2..844559232e49f 100644
--- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
+++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
@@ -15,7 +15,7 @@ var Enhancement = (function () {
         return this;
     };
     return Enhancement;
-})();
+}());
 exports.Enhancement = Enhancement;
 
 
diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
index e1786dfdd5e10..44e816712fbcd 100644
--- a/tests/baselines/reference/declFileConstructors.js
+++ b/tests/baselines/reference/declFileConstructors.js
@@ -104,7 +104,7 @@ var SimpleConstructor = (function () {
     function SimpleConstructor() {
     }
     return SimpleConstructor;
-})();
+}());
 exports.SimpleConstructor = SimpleConstructor;
 var ConstructorWithParameters = (function () {
     /** This is comment for function signature*/
@@ -114,7 +114,7 @@ var ConstructorWithParameters = (function () {
         var d = a;
     }
     return ConstructorWithParameters;
-})();
+}());
 exports.ConstructorWithParameters = ConstructorWithParameters;
 var ConstructorWithRestParamters = (function () {
     function ConstructorWithRestParamters(a) {
@@ -125,34 +125,34 @@ var ConstructorWithRestParamters = (function () {
         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) {
@@ -160,7 +160,7 @@ var ConstructorWithParameterInitializer = (function () {
         this.x = x;
     }
     return ConstructorWithParameterInitializer;
-})();
+}());
 exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer;
 //// [declFileConstructors_1.js]
 var GlobalSimpleConstructor = (function () {
@@ -168,7 +168,7 @@ var GlobalSimpleConstructor = (function () {
     function GlobalSimpleConstructor() {
     }
     return GlobalSimpleConstructor;
-})();
+}());
 var GlobalConstructorWithParameters = (function () {
     /** This is comment for function signature*/
     function GlobalConstructorWithParameters(/** this is comment about a*/ a, 
@@ -177,7 +177,7 @@ var GlobalConstructorWithParameters = (function () {
         var d = a;
     }
     return GlobalConstructorWithParameters;
-})();
+}());
 var GlobalConstructorWithRestParamters = (function () {
     function GlobalConstructorWithRestParamters(a) {
         var rests = [];
@@ -187,37 +187,37 @@ var GlobalConstructorWithRestParamters = (function () {
         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]
diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js
index 88aa985ef7b25..99affd5eb4d80 100644
--- a/tests/baselines/reference/declFileExportImportChain.js
+++ b/tests/baselines/reference/declFileExportImportChain.js
@@ -35,7 +35,7 @@ define(["require", "exports"], function (require, exports) {
                 function c1() {
                 }
                 return c1;
-            })();
+            }());
             m2.c1 = c1;
         })(m2 = m1.m2 || (m1.m2 = {}));
     })(m1 || (m1 = {}));
diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js
index 6b633b0fb9776..27c61e9e43dcb 100644
--- a/tests/baselines/reference/declFileExportImportChain2.js
+++ b/tests/baselines/reference/declFileExportImportChain2.js
@@ -32,7 +32,7 @@ define(["require", "exports"], function (require, exports) {
                 function c1() {
                 }
                 return c1;
-            })();
+            }());
             m2.c1 = c1;
         })(m2 = m1.m2 || (m1.m2 = {}));
     })(m1 || (m1 = {}));
diff --git a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js
index 5d7273098f151..dda944bef3d77 100644
--- a/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js
+++ b/tests/baselines/reference/declFileForClassWithMultipleBaseClasses.js
@@ -33,13 +33,13 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.bar = function () { };
     return B;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -48,7 +48,7 @@ var D = (function () {
     D.prototype.foo = function () { };
     D.prototype.bar = function () { };
     return D;
-})();
+}());
 
 
 //// [declFileForClassWithMultipleBaseClasses.d.ts]
diff --git a/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js b/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js
index ee2dc8e83bd9c..2c0e89fe6dbd1 100644
--- a/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js
+++ b/tests/baselines/reference/declFileForClassWithPrivateOverloadedFunction.js
@@ -12,7 +12,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { };
     return C;
-})();
+}());
 
 
 //// [declFileForClassWithPrivateOverloadedFunction.d.ts]
diff --git a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
index 0f13824fc4596..4b9535cd2c340 100644
--- a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
+++ b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
@@ -19,14 +19,14 @@ var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(X);
+}(X));
 
 
 //// [declFileForFunctionTypeAsTypeParameter.d.ts]
diff --git a/tests/baselines/reference/declFileForTypeParameters.js b/tests/baselines/reference/declFileForTypeParameters.js
index ebf4f4826ae29..3fbac683ef904 100644
--- a/tests/baselines/reference/declFileForTypeParameters.js
+++ b/tests/baselines/reference/declFileForTypeParameters.js
@@ -15,7 +15,7 @@ var C = (function () {
         return this.x;
     };
     return C;
-})();
+}());
 
 
 //// [declFileForTypeParameters.d.ts]
diff --git a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
index caaba28859aae..117bb6a7bd5d9 100644
--- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
+++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
@@ -22,19 +22,19 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Baz = (function () {
     function Baz() {
     }
     return Baz;
-})();
+}());
 
 
 //// [declFileGenericClassWithGenericExtendedClass.d.ts]
diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js
index ccc022f26d52d..0974f9d7b3692 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -52,13 +52,13 @@ var C;
         function A() {
         }
         return A;
-    })();
+    }());
     C.A = A;
     var B = (function () {
         function B() {
         }
         return B;
-    })();
+    }());
     C.B = B;
     function F(x) { return null; }
     C.F = F;
@@ -77,7 +77,7 @@ var C;
             this.val = val;
         }
         return D;
-    })();
+    }());
     C.D = D;
 })(C = exports.C || (exports.C = {}));
 exports.b = C.F;
@@ -94,7 +94,7 @@ var h = (function (_super) {
         _super.apply(this, arguments);
     }
     return h;
-})(C.A);
+}(C.A));
 exports.h = h;
 exports.j = C.F6;
 
diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js
index 416e0f6737c01..a4636d829939e 100644
--- a/tests/baselines/reference/declFileGenericType2.js
+++ b/tests/baselines/reference/declFileGenericType2.js
@@ -61,7 +61,7 @@ var templa;
                     _super.call(this);
                 }
                 return AbstractElementController;
-            })(templa.mvc.AbstractController);
+            }(templa.mvc.AbstractController));
             mvc.AbstractElementController = AbstractElementController;
         })(mvc = dom.mvc || (dom.mvc = {}));
     })(dom = templa.dom || (templa.dom = {}));
@@ -82,7 +82,7 @@ var templa;
                         this._controllers = [];
                     }
                     return AbstractCompositeElementController;
-                })(templa.dom.mvc.AbstractElementController);
+                }(templa.dom.mvc.AbstractElementController));
                 composite.AbstractCompositeElementController = AbstractCompositeElementController;
             })(composite = mvc.composite || (mvc.composite = {}));
         })(mvc = dom.mvc || (dom.mvc = {}));
diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.js b/tests/baselines/reference/declFileImportChainInExportAssignment.js
index 41157907e8b1b..a45ae847ebe19 100644
--- a/tests/baselines/reference/declFileImportChainInExportAssignment.js
+++ b/tests/baselines/reference/declFileImportChainInExportAssignment.js
@@ -19,7 +19,7 @@ var m;
             function c() {
             }
             return c;
-        })();
+        }());
         c_1.c = c;
     })(c = m.c || (m.c = {}));
 })(m || (m = {}));
diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
index e12a921ffc2a0..951291115fed7 100644
--- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
+++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
@@ -18,7 +18,7 @@ var List = (function () {
     function List() {
     }
     return List;
-})();
+}());
 
 
 //// [declFileImportedTypeUseInTypeArgPosition.d.ts]
diff --git a/tests/baselines/reference/declFileInternalAliases.js b/tests/baselines/reference/declFileInternalAliases.js
index 2ebe48ce78275..a21cb18ad1d9e 100644
--- a/tests/baselines/reference/declFileInternalAliases.js
+++ b/tests/baselines/reference/declFileInternalAliases.js
@@ -19,7 +19,7 @@ var m;
         function c() {
         }
         return c;
-    })();
+    }());
     m.c = c;
 })(m || (m = {}));
 var m1;
diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js
index c31fd6950ce56..4a317a4e72026 100644
--- a/tests/baselines/reference/declFileMethods.js
+++ b/tests/baselines/reference/declFileMethods.js
@@ -272,7 +272,7 @@ var c1 = (function () {
         return a;
     };
     return c1;
-})();
+}());
 exports.c1 = c1;
 //// [declFileMethods_1.js]
 var c2 = (function () {
@@ -355,7 +355,7 @@ var c2 = (function () {
         return a;
     };
     return c2;
-})();
+}());
 
 
 //// [declFileMethods_0.d.ts]
diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js
index 443933069da30..b2f27673c4d34 100644
--- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js
+++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js
@@ -16,7 +16,7 @@ var m1;
         function c() {
         }
         return c;
-    })();
+    }());
     m1.c = c;
 })(m1 || (m1 = {}));
 var d = {
diff --git a/tests/baselines/reference/declFileModuleContinuation.js b/tests/baselines/reference/declFileModuleContinuation.js
index 70cb0e4366800..98235e830b5f0 100644
--- a/tests/baselines/reference/declFileModuleContinuation.js
+++ b/tests/baselines/reference/declFileModuleContinuation.js
@@ -20,7 +20,7 @@ var A;
                 function W() {
                 }
                 return W;
-            })();
+            }());
             C.W = W;
         })(C = B.C || (B.C = {}));
     })(B = A.B || (A.B = {}));
diff --git a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js
index 652abed5e6ff0..6b6fe3eebe43a 100644
--- a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js
+++ b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.js
@@ -14,7 +14,7 @@ var m;
         function c() {
         }
         return c;
-    })();
+    }());
     m.c = c;
     m.a = m;
 })(m || (m = {}));
diff --git a/tests/baselines/reference/declFilePrivateMethodOverloads.js b/tests/baselines/reference/declFilePrivateMethodOverloads.js
index d6b2320b90474..531b60367a241 100644
--- a/tests/baselines/reference/declFilePrivateMethodOverloads.js
+++ b/tests/baselines/reference/declFilePrivateMethodOverloads.js
@@ -34,7 +34,7 @@ var c1 = (function () {
         // Function here
     };
     return c1;
-})();
+}());
 
 
 //// [declFilePrivateMethodOverloads.d.ts]
diff --git a/tests/baselines/reference/declFilePrivateStatic.js b/tests/baselines/reference/declFilePrivateStatic.js
index 326ce62171dda..dd81d94b3c5d1 100644
--- a/tests/baselines/reference/declFilePrivateStatic.js
+++ b/tests/baselines/reference/declFilePrivateStatic.js
@@ -43,7 +43,7 @@ var C = (function () {
     C.x = 1;
     C.y = 1;
     return C;
-})();
+}());
 
 
 //// [declFilePrivateStatic.d.ts]
diff --git a/tests/baselines/reference/declFileTypeAnnotationArrayType.js b/tests/baselines/reference/declFileTypeAnnotationArrayType.js
index 0a9d04d6bc78c..54dd7bbbc23ae 100644
--- a/tests/baselines/reference/declFileTypeAnnotationArrayType.js
+++ b/tests/baselines/reference/declFileTypeAnnotationArrayType.js
@@ -56,27 +56,27 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var m;
 (function (m) {
     var c = (function () {
         function c() {
         }
         return c;
-    })();
+    }());
     m.c = c;
     var g = (function () {
         function g() {
         }
         return g;
-    })();
+    }());
     m.g = g;
 })(m || (m = {}));
 var g = (function () {
     function g() {
     }
     return g;
-})();
+}());
 // Just the name
 function foo() {
     return [new c()];
diff --git a/tests/baselines/reference/declFileTypeAnnotationParenType.js b/tests/baselines/reference/declFileTypeAnnotationParenType.js
index 126ec3a873ef2..4afe07cc9d8d0 100644
--- a/tests/baselines/reference/declFileTypeAnnotationParenType.js
+++ b/tests/baselines/reference/declFileTypeAnnotationParenType.js
@@ -15,7 +15,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var x = [function () { return new c(); }];
 var y = [function () { return new c(); }];
 var k = (function () { return new c(); }) || "";
diff --git a/tests/baselines/reference/declFileTypeAnnotationTupleType.js b/tests/baselines/reference/declFileTypeAnnotationTupleType.js
index 91d44c2b07f1f..323fdce03f9ee 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTupleType.js
+++ b/tests/baselines/reference/declFileTypeAnnotationTupleType.js
@@ -23,27 +23,27 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var m;
 (function (m) {
     var c = (function () {
         function c() {
         }
         return c;
-    })();
+    }());
     m.c = c;
     var g = (function () {
         function g() {
         }
         return g;
-    })();
+    }());
     m.g = g;
 })(m || (m = {}));
 var g = (function () {
     function g() {
     }
     return g;
-})();
+}());
 // Just the name
 var k = [new c(), new m.c()];
 var l = k;
diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js
index 178511f2b782c..f76721493086f 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js
+++ b/tests/baselines/reference/declFileTypeAnnotationTypeAlias.js
@@ -38,7 +38,7 @@ var M;
         function c() {
         }
         return c;
-    })();
+    }());
     M.c = c;
     var m;
     (function (m) {
@@ -46,7 +46,7 @@ var M;
             function c() {
             }
             return c;
-        })();
+        }());
         m.c = c;
     })(m = M.m || (M.m = {}));
 })(M || (M = {}));
@@ -58,7 +58,7 @@ var M;
             function Window() {
             }
             return Window;
-        })();
+        }());
         N.Window = Window;
     })(N = M.N || (M.N = {}));
 })(M || (M = {}));
diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js
index 5e4a8ea714bdf..befd96a9fa741 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js
+++ b/tests/baselines/reference/declFileTypeAnnotationTypeLiteral.js
@@ -44,19 +44,19 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var g = (function () {
     function g() {
     }
     return g;
-})();
+}());
 var m;
 (function (m) {
     var c = (function () {
         function c() {
         }
         return c;
-    })();
+    }());
     m.c = c;
 })(m || (m = {}));
 // Object literal with everything
diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js
index 28443bc04ad96..e64e81e4939e2 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js
+++ b/tests/baselines/reference/declFileTypeAnnotationTypeQuery.js
@@ -48,27 +48,27 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var m;
 (function (m) {
     var c = (function () {
         function c() {
         }
         return c;
-    })();
+    }());
     m.c = c;
     var g = (function () {
         function g() {
         }
         return g;
-    })();
+    }());
     m.g = g;
 })(m || (m = {}));
 var g = (function () {
     function g() {
     }
     return g;
-})();
+}());
 // Just the name
 function foo() {
     return c;
diff --git a/tests/baselines/reference/declFileTypeAnnotationTypeReference.js b/tests/baselines/reference/declFileTypeAnnotationTypeReference.js
index 3818f38d2c1e1..7d2e7102fb652 100644
--- a/tests/baselines/reference/declFileTypeAnnotationTypeReference.js
+++ b/tests/baselines/reference/declFileTypeAnnotationTypeReference.js
@@ -48,27 +48,27 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var m;
 (function (m) {
     var c = (function () {
         function c() {
         }
         return c;
-    })();
+    }());
     m.c = c;
     var g = (function () {
         function g() {
         }
         return g;
-    })();
+    }());
     m.g = g;
 })(m || (m = {}));
 var g = (function () {
     function g() {
     }
     return g;
-})();
+}());
 // Just the name
 function foo() {
     return new c();
diff --git a/tests/baselines/reference/declFileTypeAnnotationUnionType.js b/tests/baselines/reference/declFileTypeAnnotationUnionType.js
index 0a8e256ef282b..c90501bab5cdc 100644
--- a/tests/baselines/reference/declFileTypeAnnotationUnionType.js
+++ b/tests/baselines/reference/declFileTypeAnnotationUnionType.js
@@ -27,27 +27,27 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var m;
 (function (m) {
     var c = (function () {
         function c() {
         }
         return c;
-    })();
+    }());
     m.c = c;
     var g = (function () {
         function g() {
         }
         return g;
-    })();
+    }());
     m.g = g;
 })(m || (m = {}));
 var g = (function () {
     function g() {
     }
     return g;
-})();
+}());
 // Just the name
 var k = new c() || new m.c();
 var l = new c() || new m.c();
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js
index f7dc7a18260cb..957dbb9826356 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js
@@ -107,12 +107,12 @@ var m;
         function private1() {
         }
         return private1;
-    })();
+    }());
     var public1 = (function () {
         function public1() {
         }
         return public1;
-    })();
+    }());
     m.public1 = public1;
     var m2;
     (function (m2) {
@@ -120,7 +120,7 @@ var m;
             function public2() {
             }
             return public2;
-        })();
+        }());
         m2.public2 = public2;
     })(m2 || (m2 = {}));
     var c = (function () {
@@ -256,6 +256,6 @@ var m;
             configurable: true
         });
         return c;
-    })();
+    }());
     m.c = c;
 })(m || (m = {}));
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js
index 4f66f0c8c7fc5..7774ee2720603 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js
@@ -52,12 +52,12 @@ var m;
         function private1() {
         }
         return private1;
-    })();
+    }());
     var public1 = (function () {
         function public1() {
         }
         return public1;
-    })();
+    }());
     m.public1 = public1;
     // Directly using names from this module
     function foo1(param) {
@@ -90,7 +90,7 @@ var m;
             function public2() {
             }
             return public2;
-        })();
+        }());
         m2.public2 = public2;
     })(m2 || (m2 = {}));
     function foo111(param) {
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js
index e12d9ebca6350..7e26816beb81a 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js
@@ -64,12 +64,12 @@ var m;
         function private1() {
         }
         return private1;
-    })();
+    }());
     var public1 = (function () {
         function public1() {
         }
         return public1;
-    })();
+    }());
     m.public1 = public1;
     // Directly using names from this module
     function foo1() {
@@ -106,7 +106,7 @@ var m;
             function public2() {
             }
             return public2;
-        })();
+        }());
         m2.public2 = public2;
     })(m2 || (m2 = {}));
     function foo111() {
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js
index ebad71566174f..2b7052903fb09 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js
@@ -50,7 +50,7 @@ var M;
             function Window() {
             }
             return Window;
-        })();
+        }());
         N.Window = Window;
     })(N = M.N || (M.N = {}));
 })(M || (M = {}));
@@ -62,7 +62,7 @@ var M1;
             function Window() {
             }
             return Window;
-        })();
+        }());
         N.Window = Window;
     })(N = M1.N || (M1.N = {}));
 })(M1 || (M1 = {}));
@@ -72,19 +72,19 @@ var M2;
         function private1() {
         }
         return private1;
-    })();
+    }());
     var public1 = (function () {
         function public1() {
         }
         return public1;
-    })();
+    }());
     var m3;
     (function (m3) {
         var public1 = (function () {
             function public1() {
             }
             return public1;
-        })();
+        }());
         m3.public1 = public1;
     })(m3 || (m3 = {}));
 })(M2 || (M2 = {}));
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js
index 19bdce50cd78b..46dfaf3c77e80 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js
@@ -41,14 +41,14 @@ var m;
         function private1() {
         }
         return private1;
-    })();
+    }());
     var m2;
     (function (m2) {
         var public1 = (function () {
             function public1() {
             }
             return public1;
-        })();
+        }());
         m2.public1 = public1;
     })(m2 || (m2 = {}));
     m.x2 = {
diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js
index 3d4a4337ae941..a75903c7369f8 100644
--- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js
+++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js
@@ -40,12 +40,12 @@ var m;
         function private1() {
         }
         return private1;
-    })();
+    }());
     var public1 = (function () {
         function public1() {
         }
         return public1;
-    })();
+    }());
     m.public1 = public1;
     // Directly using names from this module
     var x;
@@ -60,7 +60,7 @@ var m;
             function public2() {
             }
             return public2;
-        })();
+        }());
         m2.public2 = public2;
     })(m2 || (m2 = {}));
     var x3;
diff --git a/tests/baselines/reference/declFileTypeofClass.js b/tests/baselines/reference/declFileTypeofClass.js
index a7faca03f9d31..7058ace0c9475 100644
--- a/tests/baselines/reference/declFileTypeofClass.js
+++ b/tests/baselines/reference/declFileTypeofClass.js
@@ -21,7 +21,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var x;
 var y = c;
 var z;
@@ -29,7 +29,7 @@ var genericC = (function () {
     function genericC() {
     }
     return genericC;
-})();
+}());
 var genericX = genericC;
 
 
diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.js b/tests/baselines/reference/declFileTypeofInAnonymousType.js
index 01025ed180620..68db3d120cdfa 100644
--- a/tests/baselines/reference/declFileTypeofInAnonymousType.js
+++ b/tests/baselines/reference/declFileTypeofInAnonymousType.js
@@ -29,7 +29,7 @@ var m1;
         function c() {
         }
         return c;
-    })();
+    }());
     m1.c = c;
     (function (e) {
         e[e["weekday"] = 0] = "weekday";
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
index e21c28138a239..4ac08f97a527c 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
@@ -38,7 +38,7 @@ var X;
                     _super.apply(this, arguments);
                 }
                 return W;
-            })(A.B.Base.W);
+            }(A.B.Base.W));
             base.W = W;
         })(base = Y.base || (Y.base = {}));
     })(Y = X.Y || (X.Y = {}));
@@ -57,7 +57,7 @@ var X;
                         _super.apply(this, arguments);
                     }
                     return W;
-                })(X.Y.base.W);
+                }(X.Y.base.W));
                 Z.W = W;
             })(Z = base.Z || (base.Z = {}));
         })(base = Y.base || (Y.base = {}));
diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
index 587b8ff1e2764..6dfce6e8e6334 100644
--- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
+++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
@@ -32,7 +32,7 @@ var A;
             function EventManager() {
             }
             return EventManager;
-        })();
+        }());
         B.EventManager = EventManager;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
@@ -48,7 +48,7 @@ var A;
                     _super.apply(this, arguments);
                 }
                 return ContextMenu;
-            })(B.EventManager);
+            }(B.EventManager));
             C.ContextMenu = ContextMenu;
         })(C = B.C || (B.C = {}));
     })(B = A.B || (A.B = {}));
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
index 1e59987030280..9b69ca88dc256 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
@@ -24,7 +24,7 @@ var X;
                     function W() {
                     }
                     return W;
-                })();
+                }());
                 C.W = W;
             })(C = B.C || (B.C = {}));
         })(B = A.B || (A.B = {}));
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
index e225e9bb9f607..aa44c19444aef 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
@@ -27,7 +27,7 @@ var X;
                     function W() {
                     }
                     return W;
-                })();
+                }());
                 C.W = W;
             })(C = B.C || (B.C = {}));
         })(B = A.B || (A.B = {}));
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
index 34be43c93b37a..164626db45a10 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
@@ -27,7 +27,7 @@ var X;
                     function W() {
                     }
                     return W;
-                })();
+                }());
                 C.W = W;
             })(C = B.C || (B.C = {}));
         })(B = A.B || (A.B = {}));
diff --git a/tests/baselines/reference/declInput-2.js b/tests/baselines/reference/declInput-2.js
index dcd37454ef08e..eece6082356b2 100644
--- a/tests/baselines/reference/declInput-2.js
+++ b/tests/baselines/reference/declInput-2.js
@@ -28,12 +28,12 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     var E = (function () {
         function E() {
         }
         return E;
-    })();
+    }());
     M.E = E;
     var D = (function () {
         function D() {
@@ -45,6 +45,6 @@ var M;
         D.prototype.m262 = function (i) { };
         D.prototype.m3 = function () { return new C(); };
         return D;
-    })();
+    }());
     M.D = D;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/declInput.js b/tests/baselines/reference/declInput.js
index cd558c9340361..1f29093d0a848 100644
--- a/tests/baselines/reference/declInput.js
+++ b/tests/baselines/reference/declInput.js
@@ -23,7 +23,7 @@ var bar = (function () {
         x++;
     };
     return bar;
-})();
+}());
 
 
 //// [declInput.d.ts]
diff --git a/tests/baselines/reference/declInput3.js b/tests/baselines/reference/declInput3.js
index 3be31de3de0dd..292023270aec6 100644
--- a/tests/baselines/reference/declInput3.js
+++ b/tests/baselines/reference/declInput3.js
@@ -23,7 +23,7 @@ var bar = (function () {
         x++;
     };
     return bar;
-})();
+}());
 
 
 //// [declInput3.d.ts]
diff --git a/tests/baselines/reference/declInput4.js b/tests/baselines/reference/declInput4.js
index 07b6f091a145b..ec57bfaf3e840 100644
--- a/tests/baselines/reference/declInput4.js
+++ b/tests/baselines/reference/declInput4.js
@@ -22,12 +22,12 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     var E = (function () {
         function E() {
         }
         return E;
-    })();
+    }());
     M.E = E;
     var D = (function () {
         function D() {
@@ -36,7 +36,7 @@ var M;
         D.prototype.m242 = function () { return null; };
         D.prototype.m26 = function (i) { };
         return D;
-    })();
+    }());
     M.D = D;
 })(M || (M = {}));
 
diff --git a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js
index a98620c852902..16756fe0afe95 100644
--- a/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js
+++ b/tests/baselines/reference/declarationEmitDestructuringParameterProperties.js
@@ -23,21 +23,21 @@ var C1 = (function () {
         this.[x, y, z] = [x, y, z];
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2(_a) {
         var x = _a[0], y = _a[1], z = _a[2];
         this.[x, y, z] = [x, y, z];
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3(_a) {
         var x = _a.x, y = _a.y, z = _a.z;
         this.{ x, y, z } = { x, y, z };
     }
     return C3;
-})();
+}());
 
 
 //// [declarationEmitDestructuringParameterProperties.d.ts]
diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js
index fa3cae9478bdc..7f62541ae995e 100644
--- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js
+++ b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js
@@ -12,7 +12,7 @@ var m;
         function c() {
         }
         return c;
-    })();
+    }());
     _a = [10, new c(), 30], m.x = _a[0], m.y = _a[1], m.z = _a[2];
     var _a;
 })(m || (m = {}));
diff --git a/tests/baselines/reference/declarationEmitDetachedComment1.js b/tests/baselines/reference/declarationEmitDetachedComment1.js
index 38c7e60406db7..6d3666d389d61 100644
--- a/tests/baselines/reference/declarationEmitDetachedComment1.js
+++ b/tests/baselines/reference/declarationEmitDetachedComment1.js
@@ -41,7 +41,7 @@ var Hello = (function () {
     function Hello() {
     }
     return Hello;
-})();
+}());
 //// [test2.js]
 /* A comment at the top of the file. */
 /**
@@ -51,7 +51,7 @@ var Hi = (function () {
     function Hi() {
     }
     return Hi;
-})();
+}());
 //// [test3.js]
 // A one-line comment at the top of the file.
 /**
@@ -61,7 +61,7 @@ var Hola = (function () {
     function Hola() {
     }
     return Hola;
-})();
+}());
 
 
 //// [test1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitDetachedComment2.js b/tests/baselines/reference/declarationEmitDetachedComment2.js
index d4d176da12cb8..e06872b5eab67 100644
--- a/tests/baselines/reference/declarationEmitDetachedComment2.js
+++ b/tests/baselines/reference/declarationEmitDetachedComment2.js
@@ -38,19 +38,19 @@ var Hello = (function () {
     function Hello() {
     }
     return Hello;
-})();
+}());
 //// [test2.js]
 var Hi = (function () {
     function Hi() {
     }
     return Hi;
-})();
+}());
 //// [test3.js]
 var Hola = (function () {
     function Hola() {
     }
     return Hola;
-})();
+}());
 
 
 //// [test1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js
index f39b35fe1f11e..a60b35c73abee 100644
--- a/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js
+++ b/tests/baselines/reference/declarationEmitImportInExportAssignmentModule.js
@@ -20,7 +20,7 @@ var m;
             function c() {
             }
             return c;
-        })();
+        }());
         c_1.c = c;
     })(c = m.c || (m.c = {}));
 })(m || (m = {}));
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js
index f0db81e0ac822..5004ded4837f5 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.js
@@ -57,7 +57,7 @@ var f;
         function c() {
         }
         return c;
-    })();
+    }());
     f.c = c;
 })(f || (f = {}));
 module.exports = f;
@@ -72,7 +72,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
     var N;
     (function (N) {
@@ -95,7 +95,7 @@ var M;
             function C() {
             }
             return C;
-        })();
+        }());
         P.C = C;
         var N;
         (function (N) {
@@ -121,7 +121,7 @@ var M;
             function C() {
             }
             return C;
-        })();
+        }());
         Q.C = C;
         var N;
         (function (N) {
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmit_nameConflicts2.js
index e7b145877f823..b93745c3a12a0 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.js
@@ -28,7 +28,7 @@ var X;
                 function C() {
                 }
                 return C;
-            })();
+            }());
             base.C = C;
             var M;
             (function (M) {
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js
index 07299132bd476..f1ea96973b80e 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js
@@ -59,7 +59,7 @@ var M;
             }
             C.f = function () { };
             return C;
-        })();
+        }());
         P.C = C;
         var E = (function (_super) {
             __extends(E, _super);
@@ -67,7 +67,7 @@ var M;
                 _super.apply(this, arguments);
             }
             return E;
-        })(C);
+        }(C));
         P.E = E;
         (function (D) {
             D[D["f"] = 0] = "f";
diff --git a/tests/baselines/reference/declarationEmit_protectedMembers.js b/tests/baselines/reference/declarationEmit_protectedMembers.js
index 536f4f4aff799..5aad004939d74 100644
--- a/tests/baselines/reference/declarationEmit_protectedMembers.js
+++ b/tests/baselines/reference/declarationEmit_protectedMembers.js
@@ -83,7 +83,7 @@ var C1 = (function () {
         configurable: true
     });
     return C1;
-})();
+}());
 // Derived class overriding protected members
 var C2 = (function (_super) {
     __extends(C2, _super);
@@ -97,7 +97,7 @@ var C2 = (function (_super) {
         return _super.sf.call(this) + this.sx;
     };
     return C2;
-})(C1);
+}(C1));
 // Derived class making protected members public
 var C3 = (function (_super) {
     __extends(C3, _super);
@@ -116,7 +116,7 @@ var C3 = (function (_super) {
         configurable: true
     });
     return C3;
-})(C2);
+}(C2));
 // Protected properties in constructors
 var C4 = (function () {
     function C4(a, b) {
@@ -124,7 +124,7 @@ var C4 = (function () {
         this.b = b;
     }
     return C4;
-})();
+}());
 
 
 //// [declarationEmit_protectedMembers.d.ts]
diff --git a/tests/baselines/reference/declarationFileOverwriteError.js b/tests/baselines/reference/declarationFileOverwriteError.js
index a9ae79f8ed6d8..7bc57cce7d175 100644
--- a/tests/baselines/reference/declarationFileOverwriteError.js
+++ b/tests/baselines/reference/declarationFileOverwriteError.js
@@ -14,4 +14,4 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
diff --git a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js
index 34d9c95a00519..372d07f5ba7fb 100644
--- a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js
+++ b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.js
@@ -14,4 +14,4 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
diff --git a/tests/baselines/reference/declarationFiles.js b/tests/baselines/reference/declarationFiles.js
index 7ef41a630cba3..56f44b2c7e4f0 100644
--- a/tests/baselines/reference/declarationFiles.js
+++ b/tests/baselines/reference/declarationFiles.js
@@ -54,17 +54,17 @@ var C1 = (function () {
     }
     C1.prototype.f = function (x) { return undefined; };
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
         var _this = this;
@@ -87,4 +87,4 @@ var C4 = (function () {
         return function () { return _this; };
     };
     return C4;
-})();
+}());
diff --git a/tests/baselines/reference/declareDottedExtend.js b/tests/baselines/reference/declareDottedExtend.js
index 030e5048ef797..f1e9ea0b4deb0 100644
--- a/tests/baselines/reference/declareDottedExtend.js
+++ b/tests/baselines/reference/declareDottedExtend.js
@@ -24,11 +24,11 @@ var D = (function (_super) {
         _super.apply(this, arguments);
     }
     return D;
-})(ab.C);
+}(ab.C));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
         _super.apply(this, arguments);
     }
     return E;
-})(A.B.C);
+}(A.B.C));
diff --git a/tests/baselines/reference/declareIdentifierAsBeginningOfStatementExpression01.js b/tests/baselines/reference/declareIdentifierAsBeginningOfStatementExpression01.js
index 047b9b7671970..32bbdcff6a9ed 100644
--- a/tests/baselines/reference/declareIdentifierAsBeginningOfStatementExpression01.js
+++ b/tests/baselines/reference/declareIdentifierAsBeginningOfStatementExpression01.js
@@ -11,6 +11,6 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var declare;
 declare instanceof C;
diff --git a/tests/baselines/reference/decoratorCallGeneric.js b/tests/baselines/reference/decoratorCallGeneric.js
index 8c141d5a131d3..acc9c48297dfe 100644
--- a/tests/baselines/reference/decoratorCallGeneric.js
+++ b/tests/baselines/reference/decoratorCallGeneric.js
@@ -28,4 +28,4 @@ var C = (function () {
         dec
     ], C);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorChecksFunctionBodies.js b/tests/baselines/reference/decoratorChecksFunctionBodies.js
index a5aa63b0b31a4..d70c4a334608e 100644
--- a/tests/baselines/reference/decoratorChecksFunctionBodies.js
+++ b/tests/baselines/reference/decoratorChecksFunctionBodies.js
@@ -38,4 +38,4 @@ var A = (function () {
         })
     ], A.prototype, "m", null);
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index 51f32d67b4e82..92dcc1f836c5c 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
@@ -49,4 +49,4 @@ var Wat = (function () {
         filter(function () { return a_1.test == 'abc'; })
     ], Wat, "whatever", null);
     return Wat;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index 32ecf919593e4..2f360df061856 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -24,7 +24,7 @@ var Service = (function () {
     function Service() {
     }
     return Service;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Service;
 //// [component.js]
@@ -56,4 +56,4 @@ var MyComponent = (function () {
         __metadata('design:paramtypes', [service_1.default])
     ], MyComponent);
     return MyComponent;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js
index 911a93f948d1d..f5048ead6313d 100644
--- a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js
+++ b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js
@@ -27,4 +27,4 @@ var MyClass = (function () {
         __metadata('design:returntype', void 0)
     ], MyClass.prototype, "doSomething", null);
     return MyClass;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js
index 46d853a7dcd74..5a39a6ce42ca5 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.js
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js
@@ -24,7 +24,7 @@ var A = (function () {
         console.log('new A');
     }
     return A;
-})();
+}());
 function decorator(target, propertyKey) {
 }
 var B = (function () {
@@ -36,5 +36,5 @@ var B = (function () {
         __metadata('design:type', Object)
     ], B.prototype, "x", void 0);
     return B;
-})();
+}());
 exports.B = B;
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
index 28df2186097c1..39e8d1811aa7a 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
@@ -24,7 +24,7 @@ var A = (function () {
         console.log('new A');
     }
     return A;
-})();
+}());
 function decorator(target, propertyKey) {
 }
 var B = (function () {
@@ -36,5 +36,5 @@ var B = (function () {
         __metadata('design:type', A)
     ], B.prototype, "x", void 0);
     return B;
-})();
+}());
 exports.B = B;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
index 4b37415c4b7d0..b549d28c7f182 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
@@ -31,7 +31,7 @@ var db = (function () {
     db.prototype.doSomething = function () {
     };
     return db;
-})();
+}());
 exports.db = db;
 //// [service.js]
 "use strict";
@@ -49,5 +49,5 @@ var MyClass = (function () {
         __metadata('design:paramtypes', [db_1.db])
     ], MyClass);
     return MyClass;
-})();
+}());
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
index 015ed6eb122ce..acd86e78d76e6 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
@@ -31,7 +31,7 @@ var db = (function () {
     db.prototype.doSomething = function () {
     };
     return db;
-})();
+}());
 exports.db = db;
 //// [service.js]
 "use strict";
@@ -49,5 +49,5 @@ var MyClass = (function () {
         __metadata('design:paramtypes', [db_1.db])
     ], MyClass);
     return MyClass;
-})();
+}());
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
index 0aff28542c095..2acd829c107b6 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
@@ -31,7 +31,7 @@ var db = (function () {
     db.prototype.doSomething = function () {
     };
     return db;
-})();
+}());
 exports.db = db;
 //// [service.js]
 "use strict";
@@ -49,5 +49,5 @@ var MyClass = (function () {
         __metadata('design:paramtypes', [db.db])
     ], MyClass);
     return MyClass;
-})();
+}());
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index c9f51ae3eed8c..4af0beeddcb99 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -31,7 +31,7 @@ var db = (function () {
     db.prototype.doSomething = function () {
     };
     return db;
-})();
+}());
 exports.db = db;
 //// [service.js]
 "use strict";
@@ -49,5 +49,5 @@ var MyClass = (function () {
         __metadata('design:paramtypes', [Object])
     ], MyClass);
     return MyClass;
-})();
+}());
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index b5b1dd02ecdf8..f1537e3b447bc 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -31,7 +31,7 @@ var db = (function () {
     db.prototype.doSomething = function () {
     };
     return db;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
 //// [service.js]
@@ -50,5 +50,5 @@ var MyClass = (function () {
         __metadata('design:paramtypes', [db_1.default])
     ], MyClass);
     return MyClass;
-})();
+}());
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index 5cb989e750a8c..7ef2c28881067 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -31,7 +31,7 @@ var db = (function () {
     db.prototype.doSomething = function () {
     };
     return db;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
 //// [service.js]
@@ -50,5 +50,5 @@ var MyClass = (function () {
         __metadata('design:paramtypes', [db_1.default])
     ], MyClass);
     return MyClass;
-})();
+}());
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index 7962eae638fee..f8469cdd6a432 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -31,7 +31,7 @@ var db = (function () {
     db.prototype.doSomething = function () {
     };
     return db;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = db;
 //// [service.js]
@@ -50,5 +50,5 @@ var MyClass = (function () {
         __metadata('design:paramtypes', [Object])
     ], MyClass);
     return MyClass;
-})();
+}());
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
index d4b24d075e9f7..f1885ccfaec29 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
@@ -31,7 +31,7 @@ var db = (function () {
     db.prototype.doSomething = function () {
     };
     return db;
-})();
+}());
 exports.db = db;
 //// [service.js]
 "use strict";
@@ -49,5 +49,5 @@ var MyClass = (function () {
         __metadata('design:paramtypes', [database.db])
     ], MyClass);
     return MyClass;
-})();
+}());
 exports.MyClass = MyClass;
diff --git a/tests/baselines/reference/decoratorOnClass1.js b/tests/baselines/reference/decoratorOnClass1.js
index 81fb8a4afbfeb..7ea46b4698fc8 100644
--- a/tests/baselines/reference/decoratorOnClass1.js
+++ b/tests/baselines/reference/decoratorOnClass1.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec
     ], C);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
index d2258f2e0f357..3f24c7ae55b7b 100644
--- a/tests/baselines/reference/decoratorOnClass2.js
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -20,5 +20,5 @@ var C = (function () {
         dec
     ], C);
     return C;
-})();
+}());
 exports.C = C;
diff --git a/tests/baselines/reference/decoratorOnClass3.js b/tests/baselines/reference/decoratorOnClass3.js
index 53888b7f10789..5a3601fc1f3e8 100644
--- a/tests/baselines/reference/decoratorOnClass3.js
+++ b/tests/baselines/reference/decoratorOnClass3.js
@@ -20,4 +20,4 @@ var C = (function () {
         dec
     ], C);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClass4.js b/tests/baselines/reference/decoratorOnClass4.js
index bfcfe490498db..adbe30db662a6 100644
--- a/tests/baselines/reference/decoratorOnClass4.js
+++ b/tests/baselines/reference/decoratorOnClass4.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec()
     ], C);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClass5.js b/tests/baselines/reference/decoratorOnClass5.js
index b3ceb807408f5..6741b26373bb9 100644
--- a/tests/baselines/reference/decoratorOnClass5.js
+++ b/tests/baselines/reference/decoratorOnClass5.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec()
     ], C);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClass8.js b/tests/baselines/reference/decoratorOnClass8.js
index 81edefc39faab..e5cd8812ea780 100644
--- a/tests/baselines/reference/decoratorOnClass8.js
+++ b/tests/baselines/reference/decoratorOnClass8.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec()
     ], C);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.js b/tests/baselines/reference/decoratorOnClassAccessor1.js
index 5a5d7ec98eeb2..cf989705b79b4 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor1.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.js
@@ -24,4 +24,4 @@ var C = (function () {
         dec
     ], C.prototype, "accessor", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.js b/tests/baselines/reference/decoratorOnClassAccessor2.js
index 62b4d46669b1f..9e9455b438051 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor2.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor2.js
@@ -24,4 +24,4 @@ var C = (function () {
         dec
     ], C.prototype, "accessor", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.js b/tests/baselines/reference/decoratorOnClassAccessor3.js
index ce630dde3b225..8a27914e0c898 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor3.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.js
@@ -24,4 +24,4 @@ var C = (function () {
         dec
     ], C.prototype, "accessor", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.js b/tests/baselines/reference/decoratorOnClassAccessor4.js
index 5d47233c797db..85b35e95cef54 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor4.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor4.js
@@ -24,4 +24,4 @@ var C = (function () {
         dec
     ], C.prototype, "accessor", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.js b/tests/baselines/reference/decoratorOnClassAccessor5.js
index b038363727215..12ec7a08adcb9 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor5.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor5.js
@@ -24,4 +24,4 @@ var C = (function () {
         dec
     ], C.prototype, "accessor", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.js b/tests/baselines/reference/decoratorOnClassAccessor6.js
index e76151ef56277..d5477deb5af10 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor6.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.js
@@ -24,4 +24,4 @@ var C = (function () {
         dec
     ], C.prototype, "accessor", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassConstructor1.js b/tests/baselines/reference/decoratorOnClassConstructor1.js
index c61d1d218a5de..3d58c627602a0 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor1.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor1.js
@@ -10,4 +10,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
index b100a5a60f89d..fe04f569e30a7 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
@@ -22,4 +22,4 @@ var C = (function () {
         __param(0, dec)
     ], C);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
index 73d7bfba5a9b8..8d02bd467d6dc 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
@@ -22,4 +22,4 @@ var C = (function () {
         __param(1, dec)
     ], C);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.js b/tests/baselines/reference/decoratorOnClassMethod1.js
index 3b8d308570cc3..ef029b845431b 100644
--- a/tests/baselines/reference/decoratorOnClassMethod1.js
+++ b/tests/baselines/reference/decoratorOnClassMethod1.js
@@ -20,4 +20,4 @@ var C = (function () {
         dec
     ], C.prototype, "method", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.js b/tests/baselines/reference/decoratorOnClassMethod10.js
index 22a6be7f613f1..f90251d619694 100644
--- a/tests/baselines/reference/decoratorOnClassMethod10.js
+++ b/tests/baselines/reference/decoratorOnClassMethod10.js
@@ -20,4 +20,4 @@ var C = (function () {
         dec
     ], C.prototype, "method", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassMethod11.js b/tests/baselines/reference/decoratorOnClassMethod11.js
index 59f0594f48312..f1589a39286fa 100644
--- a/tests/baselines/reference/decoratorOnClassMethod11.js
+++ b/tests/baselines/reference/decoratorOnClassMethod11.js
@@ -26,5 +26,5 @@ var M;
             this.decorator
         ], C.prototype, "method", null);
         return C;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decoratorOnClassMethod12.js b/tests/baselines/reference/decoratorOnClassMethod12.js
index 5c43251e4c14e..0650f1d00ee25 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.js
+++ b/tests/baselines/reference/decoratorOnClassMethod12.js
@@ -28,7 +28,7 @@ var M;
         }
         S.prototype.decorator = function (target, key) { };
         return S;
-    })();
+    }());
     var C = (function (_super) {
         __extends(C, _super);
         function C() {
@@ -39,5 +39,5 @@ var M;
             _super.decorator
         ], C.prototype, "method", null);
         return C;
-    })(S);
+    }(S));
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decoratorOnClassMethod2.js b/tests/baselines/reference/decoratorOnClassMethod2.js
index 1841baeb72403..5db2922ed7187 100644
--- a/tests/baselines/reference/decoratorOnClassMethod2.js
+++ b/tests/baselines/reference/decoratorOnClassMethod2.js
@@ -20,4 +20,4 @@ var C = (function () {
         dec
     ], C.prototype, "method", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.js b/tests/baselines/reference/decoratorOnClassMethod3.js
index 8ede72027d87e..30f527368f28b 100644
--- a/tests/baselines/reference/decoratorOnClassMethod3.js
+++ b/tests/baselines/reference/decoratorOnClassMethod3.js
@@ -20,4 +20,4 @@ var C = (function () {
         dec
     ], C.prototype, "method", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassMethod8.js b/tests/baselines/reference/decoratorOnClassMethod8.js
index 2cb404cf0780f..bf8c06d9b90f6 100644
--- a/tests/baselines/reference/decoratorOnClassMethod8.js
+++ b/tests/baselines/reference/decoratorOnClassMethod8.js
@@ -20,4 +20,4 @@ var C = (function () {
         dec
     ], C.prototype, "method", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.js b/tests/baselines/reference/decoratorOnClassMethodParameter1.js
index 099f746727c52..efb1e4abff2cb 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.js
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.js
@@ -23,4 +23,4 @@ var C = (function () {
         __param(0, dec)
     ], C.prototype, "method", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassProperty1.js b/tests/baselines/reference/decoratorOnClassProperty1.js
index 9283570bf3a67..65a399332f161 100644
--- a/tests/baselines/reference/decoratorOnClassProperty1.js
+++ b/tests/baselines/reference/decoratorOnClassProperty1.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec
     ], C.prototype, "prop", void 0);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassProperty10.js b/tests/baselines/reference/decoratorOnClassProperty10.js
index 5246dff964325..9df40eaf83a38 100644
--- a/tests/baselines/reference/decoratorOnClassProperty10.js
+++ b/tests/baselines/reference/decoratorOnClassProperty10.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec()
     ], C.prototype, "prop", void 0);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassProperty11.js b/tests/baselines/reference/decoratorOnClassProperty11.js
index 51bce1f138562..8b771caf8b515 100644
--- a/tests/baselines/reference/decoratorOnClassProperty11.js
+++ b/tests/baselines/reference/decoratorOnClassProperty11.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec
     ], C.prototype, "prop", void 0);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassProperty2.js b/tests/baselines/reference/decoratorOnClassProperty2.js
index 153c72ce0b961..3ab2b515e3c02 100644
--- a/tests/baselines/reference/decoratorOnClassProperty2.js
+++ b/tests/baselines/reference/decoratorOnClassProperty2.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec
     ], C.prototype, "prop", void 0);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassProperty3.js b/tests/baselines/reference/decoratorOnClassProperty3.js
index 4f3b1ca592918..9c0d3f90e42f2 100644
--- a/tests/baselines/reference/decoratorOnClassProperty3.js
+++ b/tests/baselines/reference/decoratorOnClassProperty3.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec
     ], C.prototype, "prop", void 0);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassProperty6.js b/tests/baselines/reference/decoratorOnClassProperty6.js
index e92e018c5873f..823a652af2404 100644
--- a/tests/baselines/reference/decoratorOnClassProperty6.js
+++ b/tests/baselines/reference/decoratorOnClassProperty6.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec
     ], C.prototype, "prop", void 0);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decoratorOnClassProperty7.js b/tests/baselines/reference/decoratorOnClassProperty7.js
index 9521fe0ce5e2e..134f35022e04a 100644
--- a/tests/baselines/reference/decoratorOnClassProperty7.js
+++ b/tests/baselines/reference/decoratorOnClassProperty7.js
@@ -19,4 +19,4 @@ var C = (function () {
         dec
     ], C.prototype, "prop", void 0);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js
index 155c7cede2247..51015cf44edd3 100644
--- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.js
@@ -58,7 +58,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js
index f8021a713c4d6..94f5c942bfc49 100644
--- a/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js
+++ b/tests/baselines/reference/decrementOperatorWithAnyOtherTypeInvalidOperations.js
@@ -90,7 +90,7 @@ var A = (function () {
         return a;
     };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.js b/tests/baselines/reference/decrementOperatorWithNumberType.js
index 98f9b9d8fded2..b737c91597a64 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberType.js
+++ b/tests/baselines/reference/decrementOperatorWithNumberType.js
@@ -47,7 +47,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js
index 00a613a16f642..b49f94081b98e 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js
+++ b/tests/baselines/reference/decrementOperatorWithNumberTypeInvalidOperations.js
@@ -56,7 +56,7 @@ var A = (function () {
     }
     A.foo = function () { return 1; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js
index 9ce6d2320be13..71e52cfd197a3 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedBooleanType.js
@@ -63,7 +63,7 @@ var A = (function () {
     }
     A.foo = function () { return true; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js
index dfc828dcb288c..1502e93e75620 100644
--- a/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js
+++ b/tests/baselines/reference/decrementOperatorWithUnsupportedStringType.js
@@ -75,7 +75,7 @@ var A = (function () {
     }
     A.foo = function () { return ""; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/defaultArgsInOverloads.js b/tests/baselines/reference/defaultArgsInOverloads.js
index defc4f3e223e8..1b4c65db6533b 100644
--- a/tests/baselines/reference/defaultArgsInOverloads.js
+++ b/tests/baselines/reference/defaultArgsInOverloads.js
@@ -33,5 +33,5 @@ var C = (function () {
         if (a === void 0) { a = null; }
     };
     return C;
-})();
+}());
 var f;
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
index 57b175266c1fc..f327c62e5714e 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -31,7 +31,7 @@ var Decl = (function () {
     function Decl() {
     }
     return Decl;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
 //// [m2.js]
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js
index 0b4f77bfb10dc..4369392c6e90a 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.js
@@ -31,7 +31,7 @@ var Decl = (function () {
     function Decl() {
     }
     return Decl;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Decl;
 //// [m2.js]
diff --git a/tests/baselines/reference/defaultIndexProps1.js b/tests/baselines/reference/defaultIndexProps1.js
index fc8fe52b9fc52..58591e237cabb 100644
--- a/tests/baselines/reference/defaultIndexProps1.js
+++ b/tests/baselines/reference/defaultIndexProps1.js
@@ -18,7 +18,7 @@ var Foo = (function () {
         this.v = "Yo";
     }
     return Foo;
-})();
+}());
 var f = new Foo();
 var q = f["v"];
 var o = { v: "Yo2" };
diff --git a/tests/baselines/reference/defaultIndexProps2.js b/tests/baselines/reference/defaultIndexProps2.js
index 7652e591cc978..60478ea8a3769 100644
--- a/tests/baselines/reference/defaultIndexProps2.js
+++ b/tests/baselines/reference/defaultIndexProps2.js
@@ -21,7 +21,7 @@ var Foo = (function () {
         this.v = "Yo";
     }
     return Foo;
-})();
+}());
 var f = new Foo();
 // WScript.Echo(f[0]);
 var o = { v: "Yo2" };
diff --git a/tests/baselines/reference/defaultValueInConstructorOverload1.js b/tests/baselines/reference/defaultValueInConstructorOverload1.js
index 968876bf7ec23..a8ac6e0449134 100644
--- a/tests/baselines/reference/defaultValueInConstructorOverload1.js
+++ b/tests/baselines/reference/defaultValueInConstructorOverload1.js
@@ -11,4 +11,4 @@ var C = (function () {
         if (x === void 0) { x = ''; }
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/deleteOperatorInvalidOperations.js b/tests/baselines/reference/deleteOperatorInvalidOperations.js
index fd15797698e41..484b60b4cb4c4 100644
--- a/tests/baselines/reference/deleteOperatorInvalidOperations.js
+++ b/tests/baselines/reference/deleteOperatorInvalidOperations.js
@@ -30,4 +30,4 @@ var testADelx = (function () {
         delete s; //expect error
     }
     return testADelx;
-})();
+}());
diff --git a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js
index 03558d41e874d..a9c437b0e7bdd 100644
--- a/tests/baselines/reference/deleteOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/deleteOperatorWithAnyOtherType.js
@@ -80,7 +80,7 @@ var A = (function () {
         return a;
     };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.js b/tests/baselines/reference/deleteOperatorWithBooleanType.js
index 2b390f2dc0f60..0b45c7907b0bc 100644
--- a/tests/baselines/reference/deleteOperatorWithBooleanType.js
+++ b/tests/baselines/reference/deleteOperatorWithBooleanType.js
@@ -47,7 +47,7 @@ var A = (function () {
     }
     A.foo = function () { return false; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.js b/tests/baselines/reference/deleteOperatorWithNumberType.js
index 024fc850cc4ee..769dc81c63fd7 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.js
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.js
@@ -55,7 +55,7 @@ var A = (function () {
     }
     A.foo = function () { return 1; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.js b/tests/baselines/reference/deleteOperatorWithStringType.js
index 9dcf113b4b27f..0d084d096bab4 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.js
+++ b/tests/baselines/reference/deleteOperatorWithStringType.js
@@ -54,7 +54,7 @@ var A = (function () {
     }
     A.foo = function () { return ""; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js
index 4ce37904a222d..fad51e2ee1f43 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.js
+++ b/tests/baselines/reference/dependencyViaImportAlias.js
@@ -17,7 +17,7 @@ define(["require", "exports"], function (require, exports) {
         function A() {
         }
         return A;
-    })();
+    }());
     exports.A = A;
 });
 //// [B.js]
diff --git a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
index b9090176adddb..2e6ac2c793482 100644
--- a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
+++ b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
@@ -43,36 +43,36 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
     }
     return Derived;
-})(Base);
+}(Base));
 var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         var r2 = function () { return _super.call(this); }; // error for misplaced super call (nested function)
     }
     return Derived2;
-})(Base2);
+}(Base2));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3() {
         var r = function () { _super.call(this); }; // error
     }
     return Derived3;
-})(Base2);
+}(Base2));
 var Derived4 = (function (_super) {
     __extends(Derived4, _super);
     function Derived4() {
         var r = _super.call(this); // ok
     }
     return Derived4;
-})(Base2);
+}(Base2));
diff --git a/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js b/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
index 64da47e68e020..7dbb901362f97 100644
--- a/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
+++ b/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
@@ -33,7 +33,7 @@ var Base = (function () {
         configurable: true
     });
     return Base;
-})();
+}());
 // error
 var Derived = (function (_super) {
     __extends(Derived, _super);
@@ -44,4 +44,4 @@ var Derived = (function (_super) {
         return 1;
     };
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
index 0538ba9b54aed..0c7a21232e61c 100644
--- a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
+++ b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
@@ -64,14 +64,14 @@ var Base = (function () {
         configurable: true
     });
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var d = new Derived(1);
 var r1 = d.a;
 var r2 = d.b();
@@ -85,14 +85,14 @@ var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base2);
+}(Base2));
 var d2;
 var r7 = d2[''];
 var r8 = d2[1];
diff --git a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
index a575c9bb18335..a44d4340b8f35 100644
--- a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
+++ b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
@@ -27,7 +27,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 // ok, use assignment compatibility
 var Derived = (function (_super) {
     __extends(Derived, _super);
@@ -35,12 +35,12 @@ var Derived = (function (_super) {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
 // ok, use assignment compatibility
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
@@ -48,4 +48,4 @@ var Derived2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base2);
+}(Base2));
diff --git a/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js b/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
index 7e11209b8fe18..c81c6f048f51f 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
@@ -28,7 +28,7 @@ var BaseClass = (function () {
     BaseClass.prototype._init = function () {
     };
     return BaseClass;
-})();
+}());
 var DerivedClass = (function (_super) {
     __extends(DerivedClass, _super);
     function DerivedClass() {
@@ -37,5 +37,5 @@ var DerivedClass = (function (_super) {
     DerivedClass.prototype._init = function () {
     };
     return DerivedClass;
-})(BaseClass);
+}(BaseClass));
 new DerivedClass();
diff --git a/tests/baselines/reference/derivedClassOverridesPrivates.js b/tests/baselines/reference/derivedClassOverridesPrivates.js
index 6662b5013d8af..cd486152c1c78 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivates.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivates.js
@@ -25,23 +25,23 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base2);
+}(Base2));
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
index 21f2ce878801a..5b8af9e85bfe1 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
@@ -62,7 +62,7 @@ var Base = (function () {
         configurable: true
     });
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived(a) {
@@ -83,4 +83,4 @@ var Derived = (function (_super) {
         configurable: true
     });
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
index b5fe3e93af50c..5c7d73d5dfd1a 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
@@ -89,7 +89,7 @@ var Base = (function () {
         configurable: true
     });
     return Base;
-})();
+}());
 // Increase visibility of all protected members to public
 var Derived = (function (_super) {
     __extends(Derived, _super);
@@ -111,7 +111,7 @@ var Derived = (function (_super) {
         configurable: true
     });
     return Derived;
-})(Base);
+}(Base));
 var d = new Derived(y);
 var r1 = d.a;
 var r2 = d.b(y);
@@ -127,14 +127,14 @@ var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base2);
+}(Base2));
 var d2;
 var r7 = d2[''];
 var r8 = d2[1];
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
index c4dc1d0e9d56f..ebb675a26db2e 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
@@ -97,7 +97,7 @@ var Base = (function () {
         configurable: true
     });
     return Base;
-})();
+}());
 // Errors
 // decrease visibility of all public members to protected
 var Derived1 = (function (_super) {
@@ -106,7 +106,7 @@ var Derived1 = (function (_super) {
         _super.call(this, a);
     }
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2(a) {
@@ -114,7 +114,7 @@ var Derived2 = (function (_super) {
     }
     Derived2.prototype.b = function (a) { };
     return Derived2;
-})(Base);
+}(Base));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3(a) {
@@ -126,7 +126,7 @@ var Derived3 = (function (_super) {
         configurable: true
     });
     return Derived3;
-})(Base);
+}(Base));
 var Derived4 = (function (_super) {
     __extends(Derived4, _super);
     function Derived4(a) {
@@ -138,21 +138,21 @@ var Derived4 = (function (_super) {
         configurable: true
     });
     return Derived4;
-})(Base);
+}(Base));
 var Derived5 = (function (_super) {
     __extends(Derived5, _super);
     function Derived5(a) {
         _super.call(this, a);
     }
     return Derived5;
-})(Base);
+}(Base));
 var Derived6 = (function (_super) {
     __extends(Derived6, _super);
     function Derived6(a) {
         _super.call(this, a);
     }
     return Derived6;
-})(Base);
+}(Base));
 var Derived7 = (function (_super) {
     __extends(Derived7, _super);
     function Derived7(a) {
@@ -160,7 +160,7 @@ var Derived7 = (function (_super) {
     }
     Derived7.s = function (a) { };
     return Derived7;
-})(Base);
+}(Base));
 var Derived8 = (function (_super) {
     __extends(Derived8, _super);
     function Derived8(a) {
@@ -172,7 +172,7 @@ var Derived8 = (function (_super) {
         configurable: true
     });
     return Derived8;
-})(Base);
+}(Base));
 var Derived9 = (function (_super) {
     __extends(Derived9, _super);
     function Derived9(a) {
@@ -184,11 +184,11 @@ var Derived9 = (function (_super) {
         configurable: true
     });
     return Derived9;
-})(Base);
+}(Base));
 var Derived10 = (function (_super) {
     __extends(Derived10, _super);
     function Derived10(a) {
         _super.call(this, a);
     }
     return Derived10;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
index f25c3b792de27..b8a15ee8b6c8f 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
@@ -26,18 +26,18 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
         _super.apply(this, arguments);
     }
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived1);
+}(Derived1));
diff --git a/tests/baselines/reference/derivedClassOverridesPublicMembers.js b/tests/baselines/reference/derivedClassOverridesPublicMembers.js
index 5125be4eeeb58..b62f0d8f7d372 100644
--- a/tests/baselines/reference/derivedClassOverridesPublicMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesPublicMembers.js
@@ -88,7 +88,7 @@ var Base = (function () {
         configurable: true
     });
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived(a) {
@@ -109,7 +109,7 @@ var Derived = (function (_super) {
         configurable: true
     });
     return Derived;
-})(Base);
+}(Base));
 var d = new Derived(y);
 var r1 = d.a;
 var r2 = d.b(y);
@@ -125,14 +125,14 @@ var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base2);
+}(Base2));
 var d2;
 var r7 = d2[''];
 var r8 = d2[1];
diff --git a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
index 9762c88035aae..147e6edbbb4e6 100644
--- a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
+++ b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
@@ -33,23 +33,23 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base2);
+}(Base2));
diff --git a/tests/baselines/reference/derivedClassParameterProperties.js b/tests/baselines/reference/derivedClassParameterProperties.js
index 55c0a312b7163..c0a1736a2a3e5 100644
--- a/tests/baselines/reference/derivedClassParameterProperties.js
+++ b/tests/baselines/reference/derivedClassParameterProperties.js
@@ -105,7 +105,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived(y) {
@@ -113,7 +113,7 @@ var Derived = (function (_super) {
         _super.call(this); // ok
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2(y) {
@@ -122,7 +122,7 @@ var Derived2 = (function (_super) {
         _super.call(this); // error
     }
     return Derived2;
-})(Base);
+}(Base));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3(y) {
@@ -131,7 +131,7 @@ var Derived3 = (function (_super) {
         var a = 1;
     }
     return Derived3;
-})(Base);
+}(Base));
 var Derived4 = (function (_super) {
     __extends(Derived4, _super);
     function Derived4(y) {
@@ -140,7 +140,7 @@ var Derived4 = (function (_super) {
         _super.call(this); // error
     }
     return Derived4;
-})(Base);
+}(Base));
 var Derived5 = (function (_super) {
     __extends(Derived5, _super);
     function Derived5(y) {
@@ -149,7 +149,7 @@ var Derived5 = (function (_super) {
         var b = 2;
     }
     return Derived5;
-})(Base);
+}(Base));
 var Derived6 = (function (_super) {
     __extends(Derived6, _super);
     function Derived6(y) {
@@ -158,7 +158,7 @@ var Derived6 = (function (_super) {
         _super.call(this); // ok
     }
     return Derived6;
-})(Base);
+}(Base));
 var Derived7 = (function (_super) {
     __extends(Derived7, _super);
     function Derived7(y) {
@@ -168,7 +168,7 @@ var Derived7 = (function (_super) {
         _super.call(this); // error
     }
     return Derived7;
-})(Base);
+}(Base));
 var Derived8 = (function (_super) {
     __extends(Derived8, _super);
     function Derived8(y) {
@@ -178,13 +178,13 @@ var Derived8 = (function (_super) {
         this.b = 3;
     }
     return Derived8;
-})(Base);
+}(Base));
 // generic cases of Derived7 and Derived8
 var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
 var Derived9 = (function (_super) {
     __extends(Derived9, _super);
     function Derived9(y) {
@@ -194,7 +194,7 @@ var Derived9 = (function (_super) {
         _super.call(this); // error
     }
     return Derived9;
-})(Base2);
+}(Base2));
 var Derived10 = (function (_super) {
     __extends(Derived10, _super);
     function Derived10(y) {
@@ -204,4 +204,4 @@ var Derived10 = (function (_super) {
         this.b = 3;
     }
     return Derived10;
-})(Base2);
+}(Base2));
diff --git a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
index 0c214d42fec9a..e043ee8a5c53e 100644
--- a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
+++ b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
@@ -42,7 +42,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -79,4 +79,4 @@ var Derived = (function (_super) {
     });
     Derived.a = _super.call(this);
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
index a81a092fa54b2..1c88306bf3add 100644
--- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
+++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
@@ -38,14 +38,14 @@ var Base = (function () {
     function Base(a) {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.call(this, this); // ok
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2(a) {
@@ -53,7 +53,7 @@ var Derived2 = (function (_super) {
         this.a = a;
     }
     return Derived2;
-})(Base);
+}(Base));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3(a) {
@@ -62,7 +62,7 @@ var Derived3 = (function (_super) {
         this.a = a;
     }
     return Derived3;
-})(Base);
+}(Base));
 var Derived4 = (function (_super) {
     __extends(Derived4, _super);
     function Derived4(a) {
@@ -70,4 +70,4 @@ var Derived4 = (function (_super) {
         this.a = a;
     }
     return Derived4;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/derivedClassTransitivity.js b/tests/baselines/reference/derivedClassTransitivity.js
index de7669a71b5be..38c465492e68b 100644
--- a/tests/baselines/reference/derivedClassTransitivity.js
+++ b/tests/baselines/reference/derivedClassTransitivity.js
@@ -32,7 +32,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -40,7 +40,7 @@ var D = (function (_super) {
     }
     D.prototype.foo = function () { }; // ok to drop parameters
     return D;
-})(C);
+}(C));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -48,7 +48,7 @@ var E = (function (_super) {
     }
     E.prototype.foo = function (x) { }; // ok to add optional parameters
     return E;
-})(D);
+}(D));
 var c;
 var d;
 var e;
diff --git a/tests/baselines/reference/derivedClassTransitivity2.js b/tests/baselines/reference/derivedClassTransitivity2.js
index 22e930ab7f974..5d08905a60545 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.js
+++ b/tests/baselines/reference/derivedClassTransitivity2.js
@@ -32,7 +32,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x, y) { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -40,7 +40,7 @@ var D = (function (_super) {
     }
     D.prototype.foo = function (x) { }; // ok to drop parameters
     return D;
-})(C);
+}(C));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -48,7 +48,7 @@ var E = (function (_super) {
     }
     E.prototype.foo = function (x, y) { }; // ok to add optional parameters
     return E;
-})(D);
+}(D));
 var c;
 var d;
 var e;
diff --git a/tests/baselines/reference/derivedClassTransitivity3.js b/tests/baselines/reference/derivedClassTransitivity3.js
index a1aa3a978eb22..be7e97a8fc599 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.js
+++ b/tests/baselines/reference/derivedClassTransitivity3.js
@@ -32,7 +32,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x, y) { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -40,7 +40,7 @@ var D = (function (_super) {
     }
     D.prototype.foo = function (x) { }; // ok to drop parameters
     return D;
-})(C);
+}(C));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -48,7 +48,7 @@ var E = (function (_super) {
     }
     E.prototype.foo = function (x, y) { }; // ok to add optional parameters
     return E;
-})(D);
+}(D));
 var c;
 var d;
 var e;
diff --git a/tests/baselines/reference/derivedClassTransitivity4.js b/tests/baselines/reference/derivedClassTransitivity4.js
index a4d319707c747..0c70f03218ec5 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.js
+++ b/tests/baselines/reference/derivedClassTransitivity4.js
@@ -32,7 +32,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -40,7 +40,7 @@ var D = (function (_super) {
     }
     D.prototype.foo = function () { }; // ok to drop parameters
     return D;
-})(C);
+}(C));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -48,7 +48,7 @@ var E = (function (_super) {
     }
     E.prototype.foo = function (x) { }; // ok to add optional parameters
     return E;
-})(D);
+}(D));
 var c;
 var d;
 var e;
diff --git a/tests/baselines/reference/derivedClassWithAny.js b/tests/baselines/reference/derivedClassWithAny.js
index 123853f3afde0..34af167011d0c 100644
--- a/tests/baselines/reference/derivedClassWithAny.js
+++ b/tests/baselines/reference/derivedClassWithAny.js
@@ -87,7 +87,7 @@ var C = (function () {
         return 1;
     };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -114,7 +114,7 @@ var D = (function (_super) {
         return null;
     };
     return D;
-})(C);
+}(C));
 // if D is a valid class definition than E is now not safe tranisitively through C
 var E = (function (_super) {
     __extends(E, _super);
@@ -140,7 +140,7 @@ var E = (function (_super) {
         return '';
     };
     return E;
-})(D);
+}(D));
 var c;
 var d;
 var e;
diff --git a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
index 3454c60f88130..2c0775efc1930 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
@@ -41,7 +41,7 @@ var Base = (function () {
         configurable: true
     });
     return Base;
-})();
+}());
 // error, not a subtype
 var Derived = (function (_super) {
     __extends(Derived, _super);
@@ -58,4 +58,4 @@ var Derived = (function (_super) {
         configurable: true
     });
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
index 7de92c9cb2f5e..540be97d165f8 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
@@ -51,7 +51,7 @@ var Base = (function () {
         configurable: true
     });
     return Base;
-})();
+}());
 // error, not a subtype
 var Derived = (function (_super) {
     __extends(Derived, _super);
@@ -68,7 +68,7 @@ var Derived = (function (_super) {
         configurable: true
     });
     return Derived;
-})(Base);
+}(Base));
 var r = Base.x; // ok
 var r2 = Derived.x; // error
 var r3 = Base.fn(); // ok
diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
index 36d2b7d2dc3b3..93d5b49fcd03d 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
@@ -40,7 +40,7 @@ var Base = (function () {
         configurable: true
     });
     return Base;
-})();
+}());
 // should be error
 var Derived = (function (_super) {
     __extends(Derived, _super);
@@ -57,4 +57,4 @@ var Derived = (function (_super) {
         configurable: true
     });
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
index 36080385b3b9d..b58acc01082d8 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
@@ -52,7 +52,7 @@ var Base = (function () {
         configurable: true
     });
     return Base;
-})();
+}());
 // BUG 847404
 // should be error
 var Derived = (function (_super) {
@@ -70,7 +70,7 @@ var Derived = (function (_super) {
         configurable: true
     });
     return Derived;
-})(Base);
+}(Base));
 var r = Base.x; // ok
 var r2 = Derived.x; // error
 var r3 = Base.fn(); // ok
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
index 27a634ab2d9db..479beebbbfeef 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
@@ -37,7 +37,7 @@ var Base = (function () {
         this.a = x;
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -46,7 +46,7 @@ var Derived = (function (_super) {
         this.y = 'hello';
     }
     return Derived;
-})(Base);
+}(Base));
 var r = new Derived(); // error
 var r2 = new Derived(1);
 var Base2 = (function () {
@@ -54,7 +54,7 @@ var Base2 = (function () {
         this.a = x;
     }
     return Base2;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -63,6 +63,6 @@ var D = (function (_super) {
         this.y = null;
     }
     return D;
-})(Base2);
+}(Base2));
 var d = new D(); // error
 var d2 = new D(new Date()); // ok
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
index 82c5eec1d7dc2..4dc35c5e006e1 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
@@ -45,7 +45,7 @@ var Base = (function () {
         this.a = x;
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -54,7 +54,7 @@ var Derived = (function (_super) {
         this.y = 'hello';
     }
     return Derived;
-})(Base);
+}(Base));
 var r = new Derived(); // error
 var r2 = new Derived(1);
 var r3 = new Derived(1, 2);
@@ -64,7 +64,7 @@ var Base2 = (function () {
         this.a = x;
     }
     return Base2;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -73,7 +73,7 @@ var D = (function (_super) {
         this.y = null;
     }
     return D;
-})(Base2);
+}(Base2));
 var d = new D(); // error
 var d2 = new D(new Date()); // ok
 var d3 = new D(new Date(), new Date());
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
index 4bfa7c8157704..3b0a673d37805 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
@@ -59,7 +59,7 @@ var Base = (function () {
         this.a = x;
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived(y, z) {
@@ -68,7 +68,7 @@ var Derived = (function (_super) {
         this.b = y;
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
@@ -77,7 +77,7 @@ var Derived2 = (function (_super) {
         this.y = 'hello';
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var r = new Derived(); // error
 var r2 = new Derived2(1); // error
 var r3 = new Derived('', '');
@@ -86,7 +86,7 @@ var Base2 = (function () {
         this.a = x;
     }
     return Base2;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D(y, z) {
@@ -95,7 +95,7 @@ var D = (function (_super) {
         this.b = y;
     }
     return D;
-})(Base);
+}(Base));
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
@@ -104,7 +104,7 @@ var D2 = (function (_super) {
         this.y = null;
     }
     return D2;
-})(D);
+}(D));
 var d = new D2(); // error
 var d2 = new D2(new Date()); // error
 var d3 = new D2(new Date(), new Date()); // ok
diff --git a/tests/baselines/reference/derivedClasses.js b/tests/baselines/reference/derivedClasses.js
index 214c65bde6c4a..b6103940b33b3 100644
--- a/tests/baselines/reference/derivedClasses.js
+++ b/tests/baselines/reference/derivedClasses.js
@@ -47,14 +47,14 @@ var Red = (function (_super) {
         return getHue() + " red";
     };
     return Red;
-})(Color);
+}(Color));
 var Color = (function () {
     function Color() {
     }
     Color.prototype.shade = function () { return "some shade"; };
     Color.prototype.hue = function () { return "some hue"; };
     return Color;
-})();
+}());
 var Blue = (function (_super) {
     __extends(Blue, _super);
     function Blue() {
@@ -66,7 +66,7 @@ var Blue = (function (_super) {
         return getHue() + " blue";
     };
     return Blue;
-})(Color);
+}(Color));
 var r = new Red();
 var b = new Blue();
 r.shade();
diff --git a/tests/baselines/reference/derivedGenericClassWithAny.js b/tests/baselines/reference/derivedGenericClassWithAny.js
index 15835e78bd5af..56daf4b7310d4 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.js
+++ b/tests/baselines/reference/derivedGenericClassWithAny.js
@@ -60,7 +60,7 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -87,7 +87,7 @@ var D = (function (_super) {
         return null;
     };
     return D;
-})(C);
+}(C));
 // if D is a valid class definition than E is now not safe tranisitively through C
 var E = (function (_super) {
     __extends(E, _super);
@@ -104,7 +104,7 @@ var E = (function (_super) {
         return ''; // error
     };
     return E;
-})(D);
+}(D));
 var c;
 var d;
 var e;
diff --git a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
index 0839b93971ba6..2e0a561e846e8 100644
--- a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
+++ b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
@@ -30,7 +30,7 @@ var Base = (function () {
         return null;
     };
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -45,4 +45,4 @@ var Derived = (function (_super) {
         var r3 = this.foo({ a: 1, b: 2 }); // { a: number; b: number; }
     };
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.js b/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.js
index 7bf7444a0e5af..f9982a7bfe9ca 100644
--- a/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.js
+++ b/tests/baselines/reference/derivedTypeCallingBaseImplWithOptionalParams.js
@@ -20,7 +20,7 @@ var MyClass = (function () {
     MyClass.prototype.myMethod = function (myList) {
     };
     return MyClass;
-})();
+}());
 var x = new MyClass();
 x.myMethod(); // should be valid, but MyClass has no implementation to handle it.
 var y = new MyClass();
diff --git a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
index f00c32114cf00..cfbe44166c94e 100644
--- a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
+++ b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
@@ -30,19 +30,19 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function () {
     function Derived() {
     }
     return Derived;
-})();
+}());
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 var b;
 var d1;
 var d2;
diff --git a/tests/baselines/reference/destructuringParameterDeclaration1ES5.js b/tests/baselines/reference/destructuringParameterDeclaration1ES5.js
index 9a5b4eb81563f..28e6429fb7fa0 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration1ES5.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration1ES5.js
@@ -187,7 +187,7 @@ var C2 = (function () {
         var a = _a[0], b = _a[1], c = _a[2];
     };
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
@@ -201,7 +201,7 @@ var C3 = (function () {
         var a = _a[0], b = _a[1], c = _a[2];
     };
     return C3;
-})();
+}());
 function d5(_a) {
     var _b = _a === void 0 ? { x: 1, y: 2 } : _a, x = _b.x, y = _b.y;
 }
diff --git a/tests/baselines/reference/destructuringParameterDeclaration2.js b/tests/baselines/reference/destructuringParameterDeclaration2.js
index dcb2c87f25be8..7cc2cb52318c8 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration2.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration2.js
@@ -140,7 +140,7 @@ var C4 = (function () {
         var a = _a[0], b = _a[1], q = _a[2];
     };
     return C4;
-})();
+}());
 // Destructuring parameter declarations do not permit type annotations on the individual binding patterns,
 // as such annotations would conflict with the already established meaning of colons in object literals.
 // Type annotations must instead be written on the top- level parameter declaration
diff --git a/tests/baselines/reference/destructuringParameterDeclaration4.js b/tests/baselines/reference/destructuringParameterDeclaration4.js
index adc5264e1ffeb..2f0f24ac123df 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration4.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration4.js
@@ -90,7 +90,7 @@ var C = (function () {
         }
     } // Error, rest parameter can't have accessibilityModifier
     return C;
-})();
+}());
 // Rest parameter with generic
 function foo1() {
     var a = [];
diff --git a/tests/baselines/reference/destructuringParameterDeclaration5.js b/tests/baselines/reference/destructuringParameterDeclaration5.js
index 38366ca67ba70..2df6ce46b2c6b 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.js
@@ -61,26 +61,26 @@ var Class = (function () {
     function Class() {
     }
     return Class;
-})();
+}());
 var SubClass = (function (_super) {
     __extends(SubClass, _super);
     function SubClass() {
         _super.call(this);
     }
     return SubClass;
-})(Class);
+}(Class));
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var SubD = (function (_super) {
     __extends(SubD, _super);
     function SubD() {
         _super.call(this);
     }
     return SubD;
-})(D);
+}(D));
 function d0(_a) {
     var x = (_a === void 0 ? { x: new Class() } : _a).x;
 }
diff --git a/tests/baselines/reference/destructuringParameterProperties1.js b/tests/baselines/reference/destructuringParameterProperties1.js
index cc16cc78de59d..55d62d6720e63 100644
--- a/tests/baselines/reference/destructuringParameterProperties1.js
+++ b/tests/baselines/reference/destructuringParameterProperties1.js
@@ -36,21 +36,21 @@ var C1 = (function () {
         this.[x, y, z] = [x, y, z];
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2(_a) {
         var x = _a[0], y = _a[1], z = _a[2];
         this.[x, y, z] = [x, y, z];
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3(_a) {
         var x = _a.x, y = _a.y, z = _a.z;
         this.{ x, y, z } = { x, y, z };
     }
     return C3;
-})();
+}());
 var c1 = new C1([]);
 c1 = new C1(["larry", "{curly}", "moe"]);
 var useC1Properties = c1.x === c1.y && c1.y === c1.z;
diff --git a/tests/baselines/reference/destructuringParameterProperties2.js b/tests/baselines/reference/destructuringParameterProperties2.js
index 27e190af62f2c..086585fac8e4a 100644
--- a/tests/baselines/reference/destructuringParameterProperties2.js
+++ b/tests/baselines/reference/destructuringParameterProperties2.js
@@ -49,7 +49,7 @@ var C1 = (function () {
         return this.c;
     };
     return C1;
-})();
+}());
 var x = new C1(undefined, [0, undefined, ""]);
 var _a = [x.getA(), x.getB(), x.getC()], x_a = _a[0], x_b = _a[1], x_c = _a[2];
 var y = new C1(10, [0, "", true]);
diff --git a/tests/baselines/reference/destructuringParameterProperties3.js b/tests/baselines/reference/destructuringParameterProperties3.js
index fe9e69d7e5bc0..7199201901509 100644
--- a/tests/baselines/reference/destructuringParameterProperties3.js
+++ b/tests/baselines/reference/destructuringParameterProperties3.js
@@ -52,7 +52,7 @@ var C1 = (function () {
         return this.c;
     };
     return C1;
-})();
+}());
 var x = new C1(undefined, [0, true, ""]);
 var _a = [x.getA(), x.getB(), x.getC()], x_a = _a[0], x_b = _a[1], x_c = _a[2];
 var y = new C1(10, [0, true, true]);
diff --git a/tests/baselines/reference/destructuringParameterProperties5.js b/tests/baselines/reference/destructuringParameterProperties5.js
index d9b1710ae8935..d857ea040a8be 100644
--- a/tests/baselines/reference/destructuringParameterProperties5.js
+++ b/tests/baselines/reference/destructuringParameterProperties5.js
@@ -21,6 +21,6 @@ var C1 = (function () {
         var bar = this.x1 || this.x2 || this.x3 || this.y || this.z;
     }
     return C1;
-})();
+}());
 var a = new C1([{ x1: 10, x2: "", x3: true }, "", false]);
 var _a = [a.x1, a.x2, a.x3, a.y, a.z], a_x1 = _a[0], a_x2 = _a[1], a_x3 = _a[2], a_y = _a[3], a_z = _a[4];
diff --git a/tests/baselines/reference/destructuringWithGenericParameter.js b/tests/baselines/reference/destructuringWithGenericParameter.js
index 61d523f81fae7..40c78df673f93 100644
--- a/tests/baselines/reference/destructuringWithGenericParameter.js
+++ b/tests/baselines/reference/destructuringWithGenericParameter.js
@@ -19,7 +19,7 @@ var GenericClass = (function () {
     function GenericClass() {
     }
     return GenericClass;
-})();
+}());
 var genericObject = new GenericClass();
 function genericFunction(object, callback) {
     callback(object.payload);
diff --git a/tests/baselines/reference/destructuringWithNewExpression.js b/tests/baselines/reference/destructuringWithNewExpression.js
index 310129674b167..3f30d285b709f 100644
--- a/tests/baselines/reference/destructuringWithNewExpression.js
+++ b/tests/baselines/reference/destructuringWithNewExpression.js
@@ -11,5 +11,5 @@ var C = (function () {
         this.x = 0;
     }
     return C;
-})();
+}());
 var x = (new C).x;
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js
index 13312aea362ef..a0ae2ef15e954 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js
+++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js
@@ -20,4 +20,4 @@ var TestFile = (function () {
         this.message = getMessage();
     }
     return TestFile;
-})();
+}());
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js
index 754b432c7c5b4..284c9372dab8e 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js
+++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js
@@ -21,4 +21,4 @@ var TestFile = (function () {
         this.message = getMessage();
     }
     return TestFile;
-})();
+}());
diff --git a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js
index 3bbea65541fe3..1b459bbe06203 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js
+++ b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody1.js
@@ -20,4 +20,4 @@ var TestFile = (function () {
         return function () { return message + _this.name; };
     };
     return TestFile;
-})();
+}());
diff --git a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js
index 2a0ac0a4f0a40..8b33b737bebb2 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js
+++ b/tests/baselines/reference/detachedCommentAtStartOfFunctionBody2.js
@@ -21,4 +21,4 @@ var TestFile = (function () {
         return function () { return message + _this.name; };
     };
     return TestFile;
-})();
+}());
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
index 2505e3f60826e..51ae4090ae152 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
@@ -28,4 +28,4 @@ var TestFile = (function () {
         };
     };
     return TestFile;
-})();
+}());
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
index 53f6d08eaf557..22dfe4bbc4480 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
@@ -29,4 +29,4 @@ var TestFile = (function () {
         };
     };
     return TestFile;
-})();
+}());
diff --git a/tests/baselines/reference/differentTypesWithSameName.js b/tests/baselines/reference/differentTypesWithSameName.js
index 54a7a0f43bd66..a7278cebdbc21 100644
--- a/tests/baselines/reference/differentTypesWithSameName.js
+++ b/tests/baselines/reference/differentTypesWithSameName.js
@@ -23,7 +23,7 @@ var m;
         function variable() {
         }
         return variable;
-    })();
+    }());
     m.variable = variable;
     function doSomething(v) {
     }
@@ -33,6 +33,6 @@ var variable = (function () {
     function variable() {
     }
     return variable;
-})();
+}());
 var v = new variable();
 m.doSomething(v);
diff --git a/tests/baselines/reference/directDependenceBetweenTypeAliases.js b/tests/baselines/reference/directDependenceBetweenTypeAliases.js
index 370e33483fcd7..eaee45703f7cd 100644
--- a/tests/baselines/reference/directDependenceBetweenTypeAliases.js
+++ b/tests/baselines/reference/directDependenceBetweenTypeAliases.js
@@ -48,13 +48,13 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 // A type query directly depends on the type of the referenced entity.
 var x = [];
 var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var yy;
 var zz;
diff --git a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
index 7e292614d43f9..b6a4eb9783ed4 100644
--- a/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
+++ b/tests/baselines/reference/disallowLineTerminatorBeforeArrow.js
@@ -157,7 +157,7 @@ var m;
             };
         }
         return City;
-    })();
+    }());
     (function (Enum) {
         Enum[Enum["claw"] = (function () {
             return 10;
diff --git a/tests/baselines/reference/doNotEmitDetachedCommentsAtStartOfConstructor.js b/tests/baselines/reference/doNotEmitDetachedCommentsAtStartOfConstructor.js
index ba6dbf8b7436c..4672d9e0c4c07 100644
--- a/tests/baselines/reference/doNotEmitDetachedCommentsAtStartOfConstructor.js
+++ b/tests/baselines/reference/doNotEmitDetachedCommentsAtStartOfConstructor.js
@@ -43,22 +43,22 @@ var A = (function () {
         var x = 10;
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
         var y = 10;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
         var x = 10;
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
         var y = 10;
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.js b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.js
index de55d21cb1d53..cddfb7aecdc94 100644
--- a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.js
+++ b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNode.js
@@ -17,5 +17,5 @@ var C = (function () {
     }
     C.prototype.foo = function (x, y) { };
     return C;
-})();
+}());
 var x = 10;
diff --git a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.js b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.js
index 66896350e6d5f..3198699405d94 100644
--- a/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.js
+++ b/tests/baselines/reference/doNotEmitPinnedCommentOnNotEmittedNodets.js
@@ -15,4 +15,4 @@ var C = (function () {
     }
     C.prototype.foo = function (x, y) { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/dottedSymbolResolution1.js b/tests/baselines/reference/dottedSymbolResolution1.js
index a0ac7a38b88fd..956968761aec0 100644
--- a/tests/baselines/reference/dottedSymbolResolution1.js
+++ b/tests/baselines/reference/dottedSymbolResolution1.js
@@ -31,7 +31,7 @@ var Base = (function () {
     }
     Base.prototype.foo = function () { };
     return Base;
-})();
+}());
 function each(collection, callback) {
     return null;
 }
diff --git a/tests/baselines/reference/downlevelLetConst16.js b/tests/baselines/reference/downlevelLetConst16.js
index d6f05f7584a7c..4b9d4c438fc49 100644
--- a/tests/baselines/reference/downlevelLetConst16.js
+++ b/tests/baselines/reference/downlevelLetConst16.js
@@ -278,7 +278,7 @@ var A = (function () {
         use(x);
     };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
@@ -302,7 +302,7 @@ var B = (function () {
         use(x);
     };
     return B;
-})();
+}());
 function bar1() {
     var x = 1;
     use(x);
diff --git a/tests/baselines/reference/duplicateAnonymousInners1.js b/tests/baselines/reference/duplicateAnonymousInners1.js
index c8cb35afb2e2e..5bb73bf68ed14 100644
--- a/tests/baselines/reference/duplicateAnonymousInners1.js
+++ b/tests/baselines/reference/duplicateAnonymousInners1.js
@@ -32,12 +32,12 @@ var Foo;
         function Helper() {
         }
         return Helper;
-    })();
+    }());
     var Inner = (function () {
         function Inner() {
         }
         return Inner;
-    })();
+    }());
     // Inner should show up in intellisense
     Foo.Outer = 0;
 })(Foo || (Foo = {}));
@@ -48,5 +48,5 @@ var Foo;
         function Helper() {
         }
         return Helper;
-    })();
+    }());
 })(Foo || (Foo = {}));
diff --git a/tests/baselines/reference/duplicateAnonymousModuleClasses.js b/tests/baselines/reference/duplicateAnonymousModuleClasses.js
index f55a3ca8664fe..74f80a65d40cb 100644
--- a/tests/baselines/reference/duplicateAnonymousModuleClasses.js
+++ b/tests/baselines/reference/duplicateAnonymousModuleClasses.js
@@ -63,7 +63,7 @@ var F;
         function Helper() {
         }
         return Helper;
-    })();
+    }());
 })(F || (F = {}));
 var F;
 (function (F) {
@@ -72,7 +72,7 @@ var F;
         function Helper() {
         }
         return Helper;
-    })();
+    }());
 })(F || (F = {}));
 var Foo;
 (function (Foo) {
@@ -80,7 +80,7 @@ var Foo;
         function Helper() {
         }
         return Helper;
-    })();
+    }());
 })(Foo || (Foo = {}));
 var Foo;
 (function (Foo) {
@@ -89,7 +89,7 @@ var Foo;
         function Helper() {
         }
         return Helper;
-    })();
+    }());
 })(Foo || (Foo = {}));
 var Gar;
 (function (Gar) {
@@ -99,7 +99,7 @@ var Gar;
             function Helper() {
             }
             return Helper;
-        })();
+        }());
     })(Foo || (Foo = {}));
     var Foo;
     (function (Foo) {
@@ -108,6 +108,6 @@ var Gar;
             function Helper() {
             }
             return Helper;
-        })();
+        }());
     })(Foo || (Foo = {}));
 })(Gar || (Gar = {}));
diff --git a/tests/baselines/reference/duplicateClassElements.js b/tests/baselines/reference/duplicateClassElements.js
index da320eb9ac4a9..ed47c532a76a0 100644
--- a/tests/baselines/reference/duplicateClassElements.js
+++ b/tests/baselines/reference/duplicateClassElements.js
@@ -102,4 +102,4 @@ var a = (function () {
     a.prototype.z2 = function () {
     };
     return a;
-})();
+}());
diff --git a/tests/baselines/reference/duplicateConstructorOverloadSignature.js b/tests/baselines/reference/duplicateConstructorOverloadSignature.js
index 08bad59f53107..8d7980ea0f708 100644
--- a/tests/baselines/reference/duplicateConstructorOverloadSignature.js
+++ b/tests/baselines/reference/duplicateConstructorOverloadSignature.js
@@ -10,4 +10,4 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/duplicateConstructorOverloadSignature2.js b/tests/baselines/reference/duplicateConstructorOverloadSignature2.js
index d739150a58823..a9d2a49fb250e 100644
--- a/tests/baselines/reference/duplicateConstructorOverloadSignature2.js
+++ b/tests/baselines/reference/duplicateConstructorOverloadSignature2.js
@@ -10,4 +10,4 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/duplicateExportAssignments.js b/tests/baselines/reference/duplicateExportAssignments.js
index 934ba3ae567e6..9d75121f23224 100644
--- a/tests/baselines/reference/duplicateExportAssignments.js
+++ b/tests/baselines/reference/duplicateExportAssignments.js
@@ -53,7 +53,7 @@ var y = (function () {
     function y() {
     }
     return y;
-})();
+}());
 ;
 module.exports = x;
 //// [foo3.js]
@@ -66,7 +66,7 @@ var y = (function () {
     function y() {
     }
     return y;
-})();
+}());
 module.exports = x;
 //// [foo4.js]
 "use strict";
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
index ad96e55a5073b..21733e2cebf13 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js
@@ -59,7 +59,7 @@ var M;
         function I() {
         }
         return I;
-    })();
+    }());
     M.I = I;
 })(M || (M = {}));
 var M;
@@ -73,7 +73,7 @@ var M;
         function f() {
         }
         return f;
-    })();
+    }());
     M.f = f; // error
 })(M || (M = {}));
 var M;
@@ -86,7 +86,7 @@ var M;
         function g() {
         }
         return g;
-    })();
+    }());
     M.g = g; // no error
 })(M || (M = {}));
 var M;
@@ -95,7 +95,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
 var M;
@@ -114,7 +114,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Foo;
 (function (Foo) {
 })(Foo || (Foo = {}));
diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js
index a2509ea97f462..70635dcbd7e5a 100644
--- a/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js
+++ b/tests/baselines/reference/duplicateIdentifiersAcrossFileBoundaries.js
@@ -39,19 +39,19 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 function f() { }
 var v = 3;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var N;
 (function (N) {
     var F;
@@ -64,13 +64,13 @@ var I = (function () {
     function I() {
     }
     return I;
-})(); // error -- cannot merge interface with non-ambient class
+}()); // error -- cannot merge interface with non-ambient class
 function C2() { } // error -- cannot merge function with non-ambient class
 var f = (function () {
     function f() {
     }
     return f;
-})(); // error -- cannot merge function with non-ambient class
+}()); // error -- cannot merge function with non-ambient class
 var v = 3;
 var Foo;
 (function (Foo) {
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index e155a2e50c9d1..734b01eaed72d 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -357,7 +357,7 @@ var TestCase = (function () {
         this.errorMessageRegEx = errorMessageRegEx;
     }
     return TestCase;
-})();
+}());
 exports.TestCase = TestCase;
 var TestRunner = (function () {
     function TestRunner() {
@@ -406,7 +406,7 @@ var TestRunner = (function () {
         }
     };
     return TestRunner;
-})();
+}());
 exports.TestRunner = TestRunner;
 exports.tests = (function () {
     var testRunner = new TestRunner();
diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js
index b507e33725073..d6f5c26d628c9 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.js
+++ b/tests/baselines/reference/duplicateLocalVariable2.js
@@ -45,7 +45,7 @@ define(["require", "exports"], function (require, exports) {
             this.errorMessageRegEx = errorMessageRegEx;
         }
         return TestCase;
-    })();
+    }());
     exports.TestCase = TestCase;
     var TestRunner = (function () {
         function TestRunner() {
@@ -56,7 +56,7 @@ define(["require", "exports"], function (require, exports) {
         TestRunner.prototype.addTest = function (test) {
         };
         return TestRunner;
-    })();
+    }());
     exports.TestRunner = TestRunner;
     exports.tests = (function () {
         var testRunner = new TestRunner();
diff --git a/tests/baselines/reference/duplicateNumericIndexers.js b/tests/baselines/reference/duplicateNumericIndexers.js
index 4329e9019fbaf..87299585bb654 100644
--- a/tests/baselines/reference/duplicateNumericIndexers.js
+++ b/tests/baselines/reference/duplicateNumericIndexers.js
@@ -39,5 +39,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
diff --git a/tests/baselines/reference/duplicatePropertyNames.js b/tests/baselines/reference/duplicatePropertyNames.js
index c3cde82e2cc86..d4dfe612fc54a 100644
--- a/tests/baselines/reference/duplicatePropertyNames.js
+++ b/tests/baselines/reference/duplicatePropertyNames.js
@@ -58,7 +58,7 @@ var C = (function () {
     C.prototype.bar = function (x) { };
     C.prototype.bar = function (x) { };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: '',
diff --git a/tests/baselines/reference/duplicateStringIndexers.js b/tests/baselines/reference/duplicateStringIndexers.js
index e4f8b7c9f3c10..3708d6a4989fc 100644
--- a/tests/baselines/reference/duplicateStringIndexers.js
+++ b/tests/baselines/reference/duplicateStringIndexers.js
@@ -42,6 +42,6 @@ var test;
         function C() {
         }
         return C;
-    })();
+    }());
     var a;
 })(test || (test = {}));
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index 8a8374a8dd4a6..d37d1efb3bb09 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -101,7 +101,7 @@ define(["require", "exports"], function (require, exports) {
             function C() {
             }
             return C;
-        })();
+        }());
         var C;
         (function (C) {
             var t;
diff --git a/tests/baselines/reference/duplicateTypeParameters2.js b/tests/baselines/reference/duplicateTypeParameters2.js
index 65dce28ad3ffc..63910fa175830 100644
--- a/tests/baselines/reference/duplicateTypeParameters2.js
+++ b/tests/baselines/reference/duplicateTypeParameters2.js
@@ -10,10 +10,10 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.bar = function () { };
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/duplicateVariablesByScope.js b/tests/baselines/reference/duplicateVariablesByScope.js
index 43b6e89d412db..2f9a0348811cc 100644
--- a/tests/baselines/reference/duplicateVariablesByScope.js
+++ b/tests/baselines/reference/duplicateVariablesByScope.js
@@ -63,4 +63,4 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/elaboratedErrors.js b/tests/baselines/reference/elaboratedErrors.js
index ae5877b2dd60e..cb8d1bd1ea456 100644
--- a/tests/baselines/reference/elaboratedErrors.js
+++ b/tests/baselines/reference/elaboratedErrors.js
@@ -33,7 +33,7 @@ var WorkerFS = (function () {
     function WorkerFS() {
     }
     return WorkerFS;
-})();
+}());
 var x;
 var y;
 // Only one of these errors should be large
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.js b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.js
index df4fddd3b325a..a2c0b7df48849 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.js
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.js
@@ -14,4 +14,4 @@ var C = (function () {
         var a = function () { return arguments; };
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/emitDefaultParametersMethod.js b/tests/baselines/reference/emitDefaultParametersMethod.js
index 126c19305b389..1048926a187b0 100644
--- a/tests/baselines/reference/emitDefaultParametersMethod.js
+++ b/tests/baselines/reference/emitDefaultParametersMethod.js
@@ -43,13 +43,13 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
 var D = (function () {
     function D(y) {
         if (y === void 0) { y = "hello"; }
     }
     return D;
-})();
+}());
 var E = (function () {
     function E(y) {
         if (y === void 0) { y = "hello"; }
@@ -59,4 +59,4 @@ var E = (function () {
         }
     }
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/emitMemberAccessExpression.js b/tests/baselines/reference/emitMemberAccessExpression.js
index 92fef4b36ff0e..f242f0903c419 100644
--- a/tests/baselines/reference/emitMemberAccessExpression.js
+++ b/tests/baselines/reference/emitMemberAccessExpression.js
@@ -40,7 +40,7 @@ var Microsoft;
                     var res = Model.KnockoutExtentions;
                 };
                 return _Person;
-            })();
+            }());
             Model._Person = _Person;
         })(Model = PeopleAtWork.Model || (PeopleAtWork.Model = {}));
     })(PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}));
@@ -61,7 +61,7 @@ var Microsoft;
                 function KnockoutExtentions() {
                 }
                 return KnockoutExtentions;
-            })();
+            }());
             Model.KnockoutExtentions = KnockoutExtentions;
         })(Model = PeopleAtWork.Model || (PeopleAtWork.Model = {}));
     })(PeopleAtWork = Microsoft.PeopleAtWork || (Microsoft.PeopleAtWork = {}));
diff --git a/tests/baselines/reference/emitRestParametersMethod.js b/tests/baselines/reference/emitRestParametersMethod.js
index 5ceb6d768f89a..1dec771cde8cc 100644
--- a/tests/baselines/reference/emitRestParametersMethod.js
+++ b/tests/baselines/reference/emitRestParametersMethod.js
@@ -34,7 +34,7 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
         var rest = [];
@@ -55,4 +55,4 @@ var D = (function () {
         }
     };
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/emitThisInSuperMethodCall.js b/tests/baselines/reference/emitThisInSuperMethodCall.js
index f5cff5a8fa55c..ba648b12d8652 100644
--- a/tests/baselines/reference/emitThisInSuperMethodCall.js
+++ b/tests/baselines/reference/emitThisInSuperMethodCall.js
@@ -39,7 +39,7 @@ var User = (function () {
     User.prototype.sayHello = function () {
     };
     return User;
-})();
+}());
 var RegisteredUser = (function (_super) {
     __extends(RegisteredUser, _super);
     function RegisteredUser() {
@@ -65,4 +65,4 @@ var RegisteredUser = (function (_super) {
         }
     };
     return RegisteredUser;
-})(User);
+}(User));
diff --git a/tests/baselines/reference/emptyGenericParamList.js b/tests/baselines/reference/emptyGenericParamList.js
index c5d01778f2dfe..173a9401d878b 100644
--- a/tests/baselines/reference/emptyGenericParamList.js
+++ b/tests/baselines/reference/emptyGenericParamList.js
@@ -7,5 +7,5 @@ var I = (function () {
     function I() {
     }
     return I;
-})();
+}());
 var x;
diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js
index 892ce5f59b13c..5c85d39e1ec20 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -17,4 +17,4 @@ var B = (function (_super) {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/emptyTypeArgumentListWithNew.js b/tests/baselines/reference/emptyTypeArgumentListWithNew.js
index d51c4f630a6a2..6fe2aeb509064 100644
--- a/tests/baselines/reference/emptyTypeArgumentListWithNew.js
+++ b/tests/baselines/reference/emptyTypeArgumentListWithNew.js
@@ -7,5 +7,5 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
 new foo();
diff --git a/tests/baselines/reference/enumAssignability.js b/tests/baselines/reference/enumAssignability.js
index 5bf639d9cf1ad..79e4b461563e8 100644
--- a/tests/baselines/reference/enumAssignability.js
+++ b/tests/baselines/reference/enumAssignability.js
@@ -79,7 +79,7 @@ var Others;
         function C() {
         }
         return C;
-    })();
+    }());
     var ac;
     var ai;
     var b = e; // ok
diff --git a/tests/baselines/reference/enumAssignabilityInInheritance.js b/tests/baselines/reference/enumAssignabilityInInheritance.js
index 0143985425961..dc5237108f598 100644
--- a/tests/baselines/reference/enumAssignabilityInInheritance.js
+++ b/tests/baselines/reference/enumAssignabilityInInheritance.js
@@ -129,13 +129,13 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var r4 = foo9(E.A);
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var r4 = foo10(E.A);
 var r4 = foo11(E.A);
 var r4 = foo12(E.A);
@@ -154,7 +154,7 @@ var CC = (function () {
     function CC() {
     }
     return CC;
-})();
+}());
 var CC;
 (function (CC) {
     CC.bar = 1;
diff --git a/tests/baselines/reference/enumAssignmentCompat.js b/tests/baselines/reference/enumAssignmentCompat.js
index f56b1f300ed53..b4762d182d477 100644
--- a/tests/baselines/reference/enumAssignmentCompat.js
+++ b/tests/baselines/reference/enumAssignmentCompat.js
@@ -45,7 +45,7 @@ var W;
         function D() {
         }
         return D;
-    })();
+    }());
     W.D = D;
 })(W || (W = {}));
 var W;
diff --git a/tests/baselines/reference/enumAssignmentCompat2.js b/tests/baselines/reference/enumAssignmentCompat2.js
index 1fb7eb65e3696..0cc3b6befbf03 100644
--- a/tests/baselines/reference/enumAssignmentCompat2.js
+++ b/tests/baselines/reference/enumAssignmentCompat2.js
@@ -50,7 +50,7 @@ var W;
         function D() {
         }
         return D;
-    })();
+    }());
     W.D = D;
 })(W || (W = {}));
 var x = W;
diff --git a/tests/baselines/reference/enumGenericTypeClash.js b/tests/baselines/reference/enumGenericTypeClash.js
index 849fd2c59d63d..931df9f9d98fd 100644
--- a/tests/baselines/reference/enumGenericTypeClash.js
+++ b/tests/baselines/reference/enumGenericTypeClash.js
@@ -8,7 +8,7 @@ var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 var X;
 (function (X) {
     X[X["MyVal"] = 0] = "MyVal";
diff --git a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js
index d932985ad7dfb..56f40eef6e04a 100644
--- a/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js
+++ b/tests/baselines/reference/enumIsNotASubtypeOfAnythingButNumber.js
@@ -140,12 +140,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var E2;
 (function (E2) {
     E2[E2["A"] = 0] = "A";
@@ -159,7 +159,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var c;
 (function (c) {
     c.bar = 1;
diff --git a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
index 0b30745fa151c..96f6c65b85c7b 100644
--- a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
+++ b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
@@ -26,11 +26,11 @@ var base = (function () {
         this.n = n;
     }
     return base;
-})();
+}());
 var derived = (function (_super) {
     __extends(derived, _super);
     function derived() {
         _super.apply(this, arguments);
     }
     return derived;
-})(base);
+}(base));
diff --git a/tests/baselines/reference/errorRecoveryInClassDeclaration.js b/tests/baselines/reference/errorRecoveryInClassDeclaration.js
index 7f95bed19f977..cfe274c34bf30 100644
--- a/tests/baselines/reference/errorRecoveryInClassDeclaration.js
+++ b/tests/baselines/reference/errorRecoveryInClassDeclaration.js
@@ -15,4 +15,4 @@ var C = (function () {
         var v = foo(public, blaz(), {});
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/errorSuperCalls.js b/tests/baselines/reference/errorSuperCalls.js
index d2d4911c76ab2..4cc6a4d968fe3 100644
--- a/tests/baselines/reference/errorSuperCalls.js
+++ b/tests/baselines/reference/errorSuperCalls.js
@@ -122,12 +122,12 @@ var NoBase = (function () {
     //super call in static class member initializer with no base type
     NoBase.k = _super.call(this);
     return NoBase;
-})();
+}());
 var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     //super call with type arguments 
@@ -136,12 +136,12 @@ var Derived = (function (_super) {
         _super.call(this);
     }
     return Derived;
-})(Base);
+}(Base));
 var OtherBase = (function () {
     function OtherBase() {
     }
     return OtherBase;
-})();
+}());
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
@@ -166,4 +166,4 @@ var OtherDerived = (function (_super) {
         configurable: true
     });
     return OtherDerived;
-})(OtherBase);
+}(OtherBase));
diff --git a/tests/baselines/reference/errorSuperPropertyAccess.js b/tests/baselines/reference/errorSuperPropertyAccess.js
index 6e35248cd3513..cf6ed2598eade 100644
--- a/tests/baselines/reference/errorSuperPropertyAccess.js
+++ b/tests/baselines/reference/errorSuperPropertyAccess.js
@@ -165,7 +165,7 @@ var NoBase = (function () {
         configurable: true
     });
     return NoBase;
-})();
+}());
 var SomeBase = (function () {
     function SomeBase() {
         this.privateMember = 0;
@@ -178,7 +178,7 @@ var SomeBase = (function () {
     SomeBase.privateStaticMember = 0;
     SomeBase.publicStaticMember = 0;
     return SomeBase;
-})();
+}());
 //super.publicInstanceMemberNotFunction in constructor of derived class
 //super.publicInstanceMemberNotFunction in instance member function of derived class
 //super.publicInstanceMemberNotFunction in instance member accessor(get and set) of derived class
@@ -212,7 +212,7 @@ var SomeDerived1 = (function (_super) {
         };
     };
     return SomeDerived1;
-})(SomeBase);
+}(SomeBase));
 //super.privateProperty in constructor of derived class
 //super.privateProperty in instance member function of derived class
 //super.privateProperty in instance member accessor(get and set) of derived class
@@ -237,7 +237,7 @@ var SomeDerived2 = (function (_super) {
         configurable: true
     });
     return SomeDerived2;
-})(SomeBase);
+}(SomeBase));
 //super.publicStaticMemberNotFunction in static member function of derived class
 //super.publicStaticMemberNotFunction in static member accessor(get and set) of derived class
 //super.privateStaticProperty in static member function of derived class
@@ -268,6 +268,6 @@ var SomeDerived3 = (function (_super) {
         configurable: true
     });
     return SomeDerived3;
-})(SomeBase);
+}(SomeBase));
 // In object literal
 var obj = { n: _super.wat, p: _super.foo.call(this) };
diff --git a/tests/baselines/reference/errorSupression1.js b/tests/baselines/reference/errorSupression1.js
index 53e40e585f046..77545131ce344 100644
--- a/tests/baselines/reference/errorSupression1.js
+++ b/tests/baselines/reference/errorSupression1.js
@@ -14,7 +14,7 @@ var Foo = (function () {
     }
     Foo.bar = function () { return "x"; };
     return Foo;
-})();
+}());
 var baz = Foo.b;
 // Foo.b won't bind. 
 baz.concat("y");
diff --git a/tests/baselines/reference/errorsInGenericTypeReference.js b/tests/baselines/reference/errorsInGenericTypeReference.js
index 42c7456be60e9..a7898810e1075 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.js
+++ b/tests/baselines/reference/errorsInGenericTypeReference.js
@@ -82,14 +82,14 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 // in call type arguments
 var testClass1 = (function () {
     function testClass1() {
     }
     testClass1.prototype.method = function () { };
     return testClass1;
-})();
+}());
 var tc1 = new testClass1();
 tc1.method(); // error: could not find symbol V
 // in constructor type arguments
@@ -97,7 +97,7 @@ var testClass2 = (function () {
     function testClass2() {
     }
     return testClass2;
-})();
+}());
 var tc2 = new testClass2(); // error: could not find symbol V
 // in method return type annotation
 var testClass3 = (function () {
@@ -112,7 +112,7 @@ var testClass3 = (function () {
         configurable: true
     });
     return testClass3;
-})();
+}());
 // in function return type annotation
 function testFunction1() { return null; } // error: could not find symbol V
 // in paramter types
@@ -124,13 +124,13 @@ var testClass4 = (function () {
     function testClass4() {
     }
     return testClass4;
-})(); // error: could not find symbol V
+}()); // error: could not find symbol V
 var testClass6 = (function () {
     function testClass6() {
     }
     testClass6.prototype.method = function () { }; // error: could not find symbol V
     return testClass6;
-})();
+}());
 // in extends clause
 var testClass7 = (function (_super) {
     __extends(testClass7, _super);
@@ -138,10 +138,10 @@ var testClass7 = (function (_super) {
         _super.apply(this, arguments);
     }
     return testClass7;
-})(Foo); // error: could not find symbol V
+}(Foo)); // error: could not find symbol V
 // in implements clause
 var testClass8 = (function () {
     function testClass8() {
     }
     return testClass8;
-})(); // error: could not find symbol V
+}()); // error: could not find symbol V
diff --git a/tests/baselines/reference/es3-amd.js b/tests/baselines/reference/es3-amd.js
index 03d4a53e9c5ca..ecdbfe80b46b7 100644
--- a/tests/baselines/reference/es3-amd.js
+++ b/tests/baselines/reference/es3-amd.js
@@ -21,4 +21,4 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/es3-declaration-amd.js b/tests/baselines/reference/es3-declaration-amd.js
index 12dd009cc0e62..133cf33629a70 100644
--- a/tests/baselines/reference/es3-declaration-amd.js
+++ b/tests/baselines/reference/es3-declaration-amd.js
@@ -21,7 +21,7 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
 
 
 //// [es3-declaration-amd.d.ts]
diff --git a/tests/baselines/reference/es3-sourcemap-amd.js b/tests/baselines/reference/es3-sourcemap-amd.js
index df673a2fe5600..4b16caec72182 100644
--- a/tests/baselines/reference/es3-sourcemap-amd.js
+++ b/tests/baselines/reference/es3-sourcemap-amd.js
@@ -21,5 +21,5 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
 //# sourceMappingURL=es3-sourcemap-amd.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt b/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt
index 2a5a48fbe47b7..9cb84dff0ba9a 100644
--- a/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt
+++ b/tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt
@@ -86,7 +86,7 @@ sourceFile:es3-sourcemap-amd.ts
 1->Emitted(7, 5) Source(13, 1) + SourceIndex(0)
 2 >Emitted(7, 13) Source(13, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js
index 393302df51826..ac6a0bd24daab 100644
--- a/tests/baselines/reference/es3defaultAliasIsQuoted.js
+++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js
@@ -21,7 +21,7 @@ var Foo = (function () {
     }
     Foo.CONSTANT = "Foo";
     return Foo;
-})();
+}());
 exports.Foo = Foo;
 function assert(value) {
     if (!value)
diff --git a/tests/baselines/reference/es5-amd.js b/tests/baselines/reference/es5-amd.js
index e33fecaed64c4..ebfc5ee12d1ac 100644
--- a/tests/baselines/reference/es5-amd.js
+++ b/tests/baselines/reference/es5-amd.js
@@ -21,4 +21,4 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js
index da5bff3aea73c..6a301f9a2acd6 100644
--- a/tests/baselines/reference/es5-commonjs.js
+++ b/tests/baselines/reference/es5-commonjs.js
@@ -23,6 +23,6 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = A;
diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js
index 56bb5ba5f798d..b67c771df3cd4 100644
--- a/tests/baselines/reference/es5-commonjs4.js
+++ b/tests/baselines/reference/es5-commonjs4.js
@@ -24,6 +24,6 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
 exports.default = A;
 exports.__esModule = 1;
diff --git a/tests/baselines/reference/es5-declaration-amd.js b/tests/baselines/reference/es5-declaration-amd.js
index e180e88d5144b..32c9690dc4ed0 100644
--- a/tests/baselines/reference/es5-declaration-amd.js
+++ b/tests/baselines/reference/es5-declaration-amd.js
@@ -21,7 +21,7 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
 
 
 //// [es5-declaration-amd.d.ts]
diff --git a/tests/baselines/reference/es5-souremap-amd.js b/tests/baselines/reference/es5-souremap-amd.js
index 8bfb47fc3b8d6..b957f605e7ccb 100644
--- a/tests/baselines/reference/es5-souremap-amd.js
+++ b/tests/baselines/reference/es5-souremap-amd.js
@@ -21,5 +21,5 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
 //# sourceMappingURL=es5-souremap-amd.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-souremap-amd.sourcemap.txt b/tests/baselines/reference/es5-souremap-amd.sourcemap.txt
index 3b5226d31f19d..fc573856f9c34 100644
--- a/tests/baselines/reference/es5-souremap-amd.sourcemap.txt
+++ b/tests/baselines/reference/es5-souremap-amd.sourcemap.txt
@@ -86,7 +86,7 @@ sourceFile:es5-souremap-amd.ts
 1->Emitted(7, 5) Source(13, 1) + SourceIndex(0)
 2 >Emitted(7, 13) Source(13, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/es5-system.js b/tests/baselines/reference/es5-system.js
index 1fde76a762cc8..a9633352b8b69 100644
--- a/tests/baselines/reference/es5-system.js
+++ b/tests/baselines/reference/es5-system.js
@@ -28,7 +28,7 @@ System.register([], function(exports_1) {
                     return 42;
                 };
                 return A;
-            })();
+            }());
             exports_1("default", A);
         }
     }
diff --git a/tests/baselines/reference/es5-umd.js b/tests/baselines/reference/es5-umd.js
index 8c68092cbc649..f98d5cde719a8 100644
--- a/tests/baselines/reference/es5-umd.js
+++ b/tests/baselines/reference/es5-umd.js
@@ -22,4 +22,4 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js
index 7a6dd8f10632e..abc98aa77d689 100644
--- a/tests/baselines/reference/es5-umd2.js
+++ b/tests/baselines/reference/es5-umd2.js
@@ -31,6 +31,6 @@ export class A
             return 42;
         };
         return A;
-    })();
+    }());
     exports.A = A;
 });
diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js
index 0665c52696e9c..27e2e72aab4ff 100644
--- a/tests/baselines/reference/es5-umd3.js
+++ b/tests/baselines/reference/es5-umd3.js
@@ -31,7 +31,7 @@ export default class A
             return 42;
         };
         return A;
-    })();
+    }());
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = A;
 });
diff --git a/tests/baselines/reference/es5-umd4.js b/tests/baselines/reference/es5-umd4.js
index 546b882cac823..8ac603437593a 100644
--- a/tests/baselines/reference/es5-umd4.js
+++ b/tests/baselines/reference/es5-umd4.js
@@ -33,6 +33,6 @@ export = A;
             return 42;
         };
         return A;
-    })();
+    }());
     return A;
 });
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
index ee513ea6e5fc6..fc8acfb95eacb 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
@@ -12,7 +12,7 @@ var C = (function () {
     }
     C.prototype.method = function () { };
     return C;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
index bd348d978936b..0f60a104a7e28 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
@@ -12,7 +12,7 @@ var default_1 = (function () {
     }
     default_1.prototype.method = function () { };
     return default_1;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
index bd03861330824..00af2676a0dfd 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
@@ -24,7 +24,7 @@ var C = (function () {
         return new C();
     };
     return C;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 var after = new C();
diff --git a/tests/baselines/reference/es5ExportEqualsDts.js b/tests/baselines/reference/es5ExportEqualsDts.js
index 3d2e493a5ac25..bc083ca075605 100644
--- a/tests/baselines/reference/es5ExportEqualsDts.js
+++ b/tests/baselines/reference/es5ExportEqualsDts.js
@@ -23,7 +23,7 @@ var A = (function () {
         return aVal;
     };
     return A;
-})();
+}());
 module.exports = A;
 
 
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js
index 506f6bbed33e8..e8963b7db40bd 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js
@@ -44,7 +44,7 @@ define(["require", "exports"], function (require, exports) {
             function M_C() {
             }
             return M_C;
-        })();
+        }());
         M.M_C = M_C;
         // instantiated module
         var M_M;
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
index 22c34aa6fffbb..7060153f0d088 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
@@ -21,6 +21,6 @@ define(["require", "exports"], function (require, exports) {
             return 42;
         };
         return A;
-    })();
+    }());
     exports.A = A;
 });
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
index ec0c7fafc8559..e5f995fb5e0a4 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
@@ -20,5 +20,5 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
 exports.A = A;
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
index ae6bd73c1ccd0..34ad74818b23e 100644
--- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
+++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
@@ -20,5 +20,5 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
 exports.A = A;
diff --git a/tests/baselines/reference/es5andes6module.js b/tests/baselines/reference/es5andes6module.js
index 0d489357852cb..a6ca59befbf32 100644
--- a/tests/baselines/reference/es5andes6module.js
+++ b/tests/baselines/reference/es5andes6module.js
@@ -22,5 +22,5 @@ var A = (function () {
         return 42;
     };
     return A;
-})();
+}());
 exports.default = A;
diff --git a/tests/baselines/reference/es6ClassSuperCodegenBug.js b/tests/baselines/reference/es6ClassSuperCodegenBug.js
index 9f15af96be810..c32865478e32b 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.js
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.js
@@ -24,7 +24,7 @@ var A = (function () {
     function A(str1, str2) {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -36,4 +36,4 @@ var B = (function (_super) {
         }
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/es6ClassTest.js b/tests/baselines/reference/es6ClassTest.js
index 9247dfde1c3ce..365e91321a451 100644
--- a/tests/baselines/reference/es6ClassTest.js
+++ b/tests/baselines/reference/es6ClassTest.js
@@ -97,7 +97,7 @@ var Bar = (function () {
         return x;
     };
     return Bar;
-})();
+}());
 // new-style class
 var Foo = (function (_super) {
     __extends(Foo, _super);
@@ -115,7 +115,7 @@ var Foo = (function (_super) {
     Foo.prototype.boo = function (x) { return x; };
     Foo.statVal = 0;
     return Foo;
-})(Bar);
+}(Bar));
 var f = new Foo();
 //class GetSetMonster {
 //  // attack(target) {
diff --git a/tests/baselines/reference/es6ClassTest2.js b/tests/baselines/reference/es6ClassTest2.js
index 20200a692ff36..86ff00121cf15 100644
--- a/tests/baselines/reference/es6ClassTest2.js
+++ b/tests/baselines/reference/es6ClassTest2.js
@@ -174,7 +174,7 @@ var BasicMonster = (function () {
         // WScript.Echo("Attacks " + target);
     };
     return BasicMonster;
-})();
+}());
 var m1 = new BasicMonster("1", 100);
 var m2 = new BasicMonster("2", 100);
 m1.attack(m2);
@@ -210,7 +210,7 @@ var GetSetMonster = (function () {
         configurable: true
     });
     return GetSetMonster;
-})();
+}());
 var m3 = new BasicMonster("1", 100);
 var m4 = new BasicMonster("2", 100);
 m3.attack(m4);
@@ -226,7 +226,7 @@ var OverloadedMonster = (function () {
         //WScript.Echo("Attacks " + target);
     };
     return OverloadedMonster;
-})();
+}());
 var m5 = new OverloadedMonster("1");
 var m6 = new OverloadedMonster("2");
 m5.attack(m6);
@@ -246,7 +246,7 @@ var SplatMonster = (function () {
         }
     };
     return SplatMonster;
-})();
+}());
 function foo() { return true; }
 var PrototypeMonster = (function () {
     function PrototypeMonster() {
@@ -254,7 +254,7 @@ var PrototypeMonster = (function () {
         this.b = foo();
     }
     return PrototypeMonster;
-})();
+}());
 var SuperParent = (function () {
     function SuperParent(a) {
     }
@@ -263,7 +263,7 @@ var SuperParent = (function () {
     SuperParent.prototype.c = function () {
     };
     return SuperParent;
-})();
+}());
 var SuperChild = (function (_super) {
     __extends(SuperChild, _super);
     function SuperChild() {
@@ -276,7 +276,7 @@ var SuperChild = (function (_super) {
         _super.prototype.c.call(this);
     };
     return SuperChild;
-})(SuperParent);
+}(SuperParent));
 var Statics = (function () {
     function Statics() {
     }
@@ -285,7 +285,7 @@ var Statics = (function () {
     };
     Statics.foo = 1;
     return Statics;
-})();
+}());
 var stat = new Statics();
 var ImplementsInterface = (function () {
     function ImplementsInterface() {
@@ -293,7 +293,7 @@ var ImplementsInterface = (function () {
         this.z = "foo";
     }
     return ImplementsInterface;
-})();
+}());
 var Visibility = (function () {
     function Visibility() {
         this.x = 1;
@@ -302,14 +302,14 @@ var Visibility = (function () {
     Visibility.prototype.foo = function () { };
     Visibility.prototype.bar = function () { };
     return Visibility;
-})();
+}());
 var BaseClassWithConstructor = (function () {
     function BaseClassWithConstructor(x, s) {
         this.x = x;
         this.s = s;
     }
     return BaseClassWithConstructor;
-})();
+}());
 // used to test codegen
 var ChildClassWithoutConstructor = (function (_super) {
     __extends(ChildClassWithoutConstructor, _super);
@@ -317,5 +317,5 @@ var ChildClassWithoutConstructor = (function (_super) {
         _super.apply(this, arguments);
     }
     return ChildClassWithoutConstructor;
-})(BaseClassWithConstructor);
+}(BaseClassWithConstructor));
 var ccwc = new ChildClassWithoutConstructor(1, "s");
diff --git a/tests/baselines/reference/es6ClassTest3.js b/tests/baselines/reference/es6ClassTest3.js
index 572bd0796363c..daf6f63a2c18f 100644
--- a/tests/baselines/reference/es6ClassTest3.js
+++ b/tests/baselines/reference/es6ClassTest3.js
@@ -27,5 +27,5 @@ var M;
         Visibility.prototype.bar = function () { };
         ;
         return Visibility;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/es6ClassTest5.js b/tests/baselines/reference/es6ClassTest5.js
index b6d3e55b8e1d1..b909fac58b50f 100644
--- a/tests/baselines/reference/es6ClassTest5.js
+++ b/tests/baselines/reference/es6ClassTest5.js
@@ -20,10 +20,10 @@ var C1T5 = (function () {
         };
     }
     return C1T5;
-})();
+}());
 var bigClass = (function () {
     function bigClass() {
         this.break = 1;
     }
     return bigClass;
-})();
+}());
diff --git a/tests/baselines/reference/es6ClassTest7.js b/tests/baselines/reference/es6ClassTest7.js
index 970e9c4fd9eb4..14662410a1405 100644
--- a/tests/baselines/reference/es6ClassTest7.js
+++ b/tests/baselines/reference/es6ClassTest7.js
@@ -20,4 +20,4 @@ var Bar = (function (_super) {
         _super.apply(this, arguments);
     }
     return Bar;
-})(M.Foo);
+}(M.Foo));
diff --git a/tests/baselines/reference/es6ClassTest8.js b/tests/baselines/reference/es6ClassTest8.js
index f96bbd16b0b89..afac7054ee384 100644
--- a/tests/baselines/reference/es6ClassTest8.js
+++ b/tests/baselines/reference/es6ClassTest8.js
@@ -50,7 +50,7 @@ var C = (function () {
         var b = f1(f1(bar));
     }
     return C;
-})();
+}());
 var Vector = (function () {
     function Vector(x, y, z) {
         this.x = x;
@@ -63,7 +63,7 @@ var Vector = (function () {
     Vector.cross = function (v1, v2) { return null; };
     Vector.dot = function (v1, v2) { return null; };
     return Vector;
-})();
+}());
 var Camera = (function () {
     function Camera(pos, lookAt) {
         this.pos = pos;
@@ -73,4 +73,4 @@ var Camera = (function () {
         this.up = Vector.times(down, Vector.norm(Vector.cross(this.forward, this.right)));
     }
     return Camera;
-})();
+}());
diff --git a/tests/baselines/reference/es6DeclOrdering.js b/tests/baselines/reference/es6DeclOrdering.js
index 53726e3b0bf08..b5dc55ebc9c72 100644
--- a/tests/baselines/reference/es6DeclOrdering.js
+++ b/tests/baselines/reference/es6DeclOrdering.js
@@ -26,4 +26,4 @@ var Bar = (function () {
         return this._store.length;
     };
     return Bar;
-})();
+}());
diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js
index fcd858bf457f7..73de2e7cce36e 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.js
+++ b/tests/baselines/reference/es6ExportAllInEs5.js
@@ -22,7 +22,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 exports.c = c;
 var m;
 (function (m) {
diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js
index 9d30e585fdeb2..f602f1ff609fb 100644
--- a/tests/baselines/reference/es6ExportClauseInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseInEs5.js
@@ -22,7 +22,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 exports.c = c;
 exports.c2 = c;
 var m;
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
index 83fb99134deea..ab9bd3d98c814 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
@@ -26,7 +26,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 exports.c = c;
 var m;
 (function (m) {
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js
index 7adac1fab327a..dbc90cb80a3ce 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -17,7 +17,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = c;
 //// [client.js]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
index 6618fcb9db701..a0916932d4ccf 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
@@ -30,37 +30,37 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 exports.a = a;
 var x = (function () {
     function x() {
     }
     return x;
-})();
+}());
 exports.x = x;
 var m = (function () {
     function m() {
     }
     return m;
-})();
+}());
 exports.m = m;
 var a11 = (function () {
     function a11() {
     }
     return a11;
-})();
+}());
 exports.a11 = a11;
 var a12 = (function () {
     function a12() {
     }
     return a12;
-})();
+}());
 exports.a12 = a12;
 var x11 = (function () {
     function x11() {
     }
     return x11;
-})();
+}());
 exports.x11 = x11;
 //// [client.js]
 "use strict";
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index f2a50fb494b8d..b588c9516e9f4 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -25,7 +25,7 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = a;
 //// [client.js]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index c4d43e40daf7f..20abd2e61327f 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -14,7 +14,7 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 exports.a = a;
 //// [client.js]
 "use strict";
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index 94b3296f36318..5a2f1f35290f9 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -16,7 +16,7 @@ define(["require", "exports"], function (require, exports) {
         function a() {
         }
         return a;
-    })();
+    }());
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = a;
 });
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
index 0e6252a76a5ef..cf66c08331e3a 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -15,7 +15,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 exports.c = c;
 ;
 //// [client.js]
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js
index ceb8219b2fd78..7fdf620164b07 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportNamedImportDts.js
@@ -52,85 +52,85 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 exports.a = a;
 var a11 = (function () {
     function a11() {
     }
     return a11;
-})();
+}());
 exports.a11 = a11;
 var a12 = (function () {
     function a12() {
     }
     return a12;
-})();
+}());
 exports.a12 = a12;
 var x = (function () {
     function x() {
     }
     return x;
-})();
+}());
 exports.x = x;
 var x11 = (function () {
     function x11() {
     }
     return x11;
-})();
+}());
 exports.x11 = x11;
 var m = (function () {
     function m() {
     }
     return m;
-})();
+}());
 exports.m = m;
 var a1 = (function () {
     function a1() {
     }
     return a1;
-})();
+}());
 exports.a1 = a1;
 var x1 = (function () {
     function x1() {
     }
     return x1;
-})();
+}());
 exports.x1 = x1;
 var a111 = (function () {
     function a111() {
     }
     return a111;
-})();
+}());
 exports.a111 = a111;
 var x111 = (function () {
     function x111() {
     }
     return x111;
-})();
+}());
 exports.x111 = x111;
 var z1 = (function () {
     function z1() {
     }
     return z1;
-})();
+}());
 exports.z1 = z1;
 var z2 = (function () {
     function z2() {
     }
     return z2;
-})();
+}());
 exports.z2 = z2;
 var aaaa = (function () {
     function aaaa() {
     }
     return aaaa;
-})();
+}());
 exports.aaaa = aaaa;
 var aaaa1 = (function () {
     function aaaa1() {
     }
     return aaaa1;
-})();
+}());
 exports.aaaa1 = aaaa1;
 //// [client.js]
 "use strict";
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
index 03c74489bfd36..3e85778de5892 100644
--- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
@@ -20,7 +20,7 @@ var a;
         function c() {
         }
         return c;
-    })();
+    }());
     a.c = c;
 })(a = exports.a || (exports.a = {}));
 //// [es6ImportNamedImportInIndirectExportAssignment_1.js]
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
index da401100405ea..583a008f0aca2 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
@@ -27,14 +27,14 @@ var C = (function () {
         this.prop = "hello";
     }
     return C;
-})();
+}());
 exports.C = C;
 var C2 = (function () {
     function C2() {
         this.prop2 = "world";
     }
     return C2;
-})();
+}());
 exports.C2 = C2;
 //// [client.js]
 "use strict";
diff --git a/tests/baselines/reference/es6MemberScoping.js b/tests/baselines/reference/es6MemberScoping.js
index 7e70045ceb3c8..d38a64c611a03 100644
--- a/tests/baselines/reference/es6MemberScoping.js
+++ b/tests/baselines/reference/es6MemberScoping.js
@@ -26,10 +26,10 @@ var Foo = (function () {
         return this._store.length;
     };
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
     Foo2.Foo2 = function () { return 0; }; // should not be an error
     return Foo2;
-})();
+}());
diff --git a/tests/baselines/reference/escapedIdentifiers.js b/tests/baselines/reference/escapedIdentifiers.js
index 64eaaa5784fde..c1b5fe8ae091a 100644
--- a/tests/baselines/reference/escapedIdentifiers.js
+++ b/tests/baselines/reference/escapedIdentifiers.js
@@ -154,12 +154,12 @@ var classType1 = (function () {
     function classType1() {
     }
     return classType1;
-})();
+}());
 var classType\u0032 = (function () {
     function classType\u0032() {
     }
     return classType\u0032;
-})();
+}());
 var classType1Object1 = new classType1();
 classType1Object1.foo1 = 2;
 var classType1Object2 = new classType\u0031();
@@ -187,7 +187,7 @@ var testClass = (function () {
         arg4 = 2;
     };
     return testClass;
-})();
+}());
 // constructors
 var constructorTestClass = (function () {
     function constructorTestClass(arg1, arg\u0032, arg\u0033, arg4) {
@@ -197,7 +197,7 @@ var constructorTestClass = (function () {
         this.arg4 = arg4;
     }
     return constructorTestClass;
-})();
+}());
 var constructorTestObject = new constructorTestClass(1, 'string', true, 2);
 constructorTestObject.arg\u0031 = 1;
 constructorTestObject.arg2 = 'string';
diff --git a/tests/baselines/reference/everyTypeAssignableToAny.js b/tests/baselines/reference/everyTypeAssignableToAny.js
index 8730167c3ff94..0b72b9156186c 100644
--- a/tests/baselines/reference/everyTypeAssignableToAny.js
+++ b/tests/baselines/reference/everyTypeAssignableToAny.js
@@ -66,7 +66,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var ac;
 var ai;
 var E;
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js
index 707801dc4ee96..50068024b830b 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.js
@@ -53,12 +53,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 function F(x) { return 42; }
 var M;
 (function (M) {
@@ -66,7 +66,7 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     function F2(x) { return x.toString(); }
     M.F2 = F2;
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js
index 40e45bf7ec0ef..8ae23514920eb 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInvalidInitializer.js
@@ -59,12 +59,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 function F(x) { return 42; }
 function F2(x) { return x < 42; }
 var M;
@@ -73,7 +73,7 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     function F2(x) { return x.toString(); }
     M.F2 = F2;
@@ -84,7 +84,7 @@ var N;
         function A() {
         }
         return A;
-    })();
+    }());
     N.A = A;
     function F2(x) { return x.toString(); }
     N.F2 = F2;
diff --git a/tests/baselines/reference/everyTypeWithInitializer.js b/tests/baselines/reference/everyTypeWithInitializer.js
index aae0a9fe2915d..b6af5725c9235 100644
--- a/tests/baselines/reference/everyTypeWithInitializer.js
+++ b/tests/baselines/reference/everyTypeWithInitializer.js
@@ -54,12 +54,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 function F(x) { return 42; }
 var M;
 (function (M) {
@@ -67,7 +67,7 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     function F2(x) { return x.toString(); }
     M.F2 = F2;
diff --git a/tests/baselines/reference/exportAlreadySeen.js b/tests/baselines/reference/exportAlreadySeen.js
index 68d30a697fdc3..749b08b18cd49 100644
--- a/tests/baselines/reference/exportAlreadySeen.js
+++ b/tests/baselines/reference/exportAlreadySeen.js
@@ -31,7 +31,7 @@ var M;
             function C() {
             }
             return C;
-        })();
+        }());
         N.C = C;
     })(N = M.N || (M.N = {}));
 })(M || (M = {}));
diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js
index 0fbfcc939482a..bdfceef6b8051 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.js
+++ b/tests/baselines/reference/exportAssignClassAndModule.js
@@ -24,7 +24,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 module.exports = Foo;
 //// [exportAssignClassAndModule_1.js]
 "use strict";
diff --git a/tests/baselines/reference/exportAssignNonIdentifier.js b/tests/baselines/reference/exportAssignNonIdentifier.js
index 8a266a35396bf..6209ade63cde2 100644
--- a/tests/baselines/reference/exportAssignNonIdentifier.js
+++ b/tests/baselines/reference/exportAssignNonIdentifier.js
@@ -40,7 +40,7 @@ module.exports = (function () {
     function Foo3() {
     }
     return Foo3;
-})();
+}());
 //// [foo4.js]
 "use strict";
 module.exports = true;
diff --git a/tests/baselines/reference/exportAssignmentAndDeclaration.js b/tests/baselines/reference/exportAssignmentAndDeclaration.js
index b2202df50e6fa..9e87d733c6be0 100644
--- a/tests/baselines/reference/exportAssignmentAndDeclaration.js
+++ b/tests/baselines/reference/exportAssignmentAndDeclaration.js
@@ -23,6 +23,6 @@ define(["require", "exports"], function (require, exports) {
         function C1() {
         }
         return C1;
-    })();
+    }());
     return C1;
 });
diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js
index 000684f1a9fbb..02c74fe1f3967 100644
--- a/tests/baselines/reference/exportAssignmentClass.js
+++ b/tests/baselines/reference/exportAssignmentClass.js
@@ -19,7 +19,7 @@ define(["require", "exports"], function (require, exports) {
             this.p = 0;
         }
         return C;
-    })();
+    }());
     return C;
 });
 //// [exportAssignmentClass_B.js]
diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
index 08c1adb3a04c1..c0b8f2b50c11a 100644
--- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
+++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
@@ -20,7 +20,7 @@ var Foo = (function () {
     function Foo(x) {
     }
     return Foo;
-})();
+}());
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js
index e9c6e82152207..390a929ce355e 100644
--- a/tests/baselines/reference/exportAssignmentGenericType.js
+++ b/tests/baselines/reference/exportAssignmentGenericType.js
@@ -18,7 +18,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js
index 54d936a410181..0504bad39c7b0 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -20,7 +20,7 @@ define(["require", "exports"], function (require, exports) {
         function T() {
         }
         return T;
-    })();
+    }());
     return T;
 });
 //// [exportAssignmentOfGenericType1_1.js]
@@ -37,7 +37,7 @@ define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (req
             _super.apply(this, arguments);
         }
         return M;
-    })(q);
+    }(q));
     var m;
     var r = m.foo;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
index 28075a7e55b3b..08220cc8de3bd 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
@@ -24,7 +24,7 @@ define(["require", "exports"], function (require, exports) {
             this.test = "test";
         }
         return Foo;
-    })();
+    }());
     var Foo;
     (function (Foo) {
         Foo.answer = 42;
diff --git a/tests/baselines/reference/exportAssignmentWithExports.js b/tests/baselines/reference/exportAssignmentWithExports.js
index 9f43a515ad06a..626e7881548d7 100644
--- a/tests/baselines/reference/exportAssignmentWithExports.js
+++ b/tests/baselines/reference/exportAssignmentWithExports.js
@@ -9,11 +9,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 exports.C = C;
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 module.exports = D;
diff --git a/tests/baselines/reference/exportCodeGen.js b/tests/baselines/reference/exportCodeGen.js
index 30ed0b07ae96d..41564c35d1a68 100644
--- a/tests/baselines/reference/exportCodeGen.js
+++ b/tests/baselines/reference/exportCodeGen.js
@@ -100,7 +100,7 @@ var E;
         function C() {
         }
         return C;
-    })();
+    }());
     E.C = C;
     var M;
     (function (M) {
@@ -120,7 +120,7 @@ var F;
         function C() {
         }
         return C;
-    })();
+    }());
     var M;
     (function (M) {
         var x = 42;
diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js
index 39c8123a1e79c..ecd9d5adf4d72 100644
--- a/tests/baselines/reference/exportDeclarationInInternalModule.js
+++ b/tests/baselines/reference/exportDeclarationInInternalModule.js
@@ -28,21 +28,21 @@ var Bbb = (function () {
     function Bbb() {
     }
     return Bbb;
-})();
+}());
 var Aaa = (function (_super) {
     __extends(Aaa, _super);
     function Aaa() {
         _super.apply(this, arguments);
     }
     return Aaa;
-})(Bbb);
+}(Bbb));
 var Aaa;
 (function (Aaa) {
     var SomeType = (function () {
         function SomeType() {
         }
         return SomeType;
-    })();
+    }());
     Aaa.SomeType = SomeType;
 })(Aaa || (Aaa = {}));
 var Bbb;
@@ -51,7 +51,7 @@ var Bbb;
         function SomeType() {
         }
         return SomeType;
-    })();
+    }());
     Bbb.SomeType = SomeType;
      // this line causes the nullref
 })(Bbb || (Bbb = {}));
diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js
index 0177bbbecaaf7..eb0623efced10 100644
--- a/tests/baselines/reference/exportImport.js
+++ b/tests/baselines/reference/exportImport.js
@@ -23,7 +23,7 @@ define(["require", "exports"], function (require, exports) {
             this.name = 'one';
         }
         return Widget1;
-    })();
+    }());
     return Widget1;
 });
 //// [exporter.js]
diff --git a/tests/baselines/reference/exportImportAlias.js b/tests/baselines/reference/exportImportAlias.js
index dea9705fc9fdb..be77f755368e6 100644
--- a/tests/baselines/reference/exportImportAlias.js
+++ b/tests/baselines/reference/exportImportAlias.js
@@ -79,7 +79,7 @@ var A;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
 })(A || (A = {}));
 var C;
@@ -104,7 +104,7 @@ var X;
                 this.y = y;
             }
             return Point;
-        })();
+        }());
         Y.Point = Point;
     })(Y = X.Y || (X.Y = {}));
 })(X || (X = {}));
@@ -122,7 +122,7 @@ var K;
             this.name = name;
         }
         return L;
-    })();
+    }());
     K.L = L;
     var L;
     (function (L) {
diff --git a/tests/baselines/reference/exportImportAndClodule.js b/tests/baselines/reference/exportImportAndClodule.js
index 0873051b40dbc..e519d555792b1 100644
--- a/tests/baselines/reference/exportImportAndClodule.js
+++ b/tests/baselines/reference/exportImportAndClodule.js
@@ -27,7 +27,7 @@ var K;
             this.name = name;
         }
         return L;
-    })();
+    }());
     K.L = L;
     var L;
     (function (L) {
diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
index 9759f41831b66..d8dd17a562cce 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
@@ -44,7 +44,7 @@ define(["require", "exports"], function (require, exports) {
         function A() {
         }
         return A;
-    })();
+    }());
     var B;
     (function (B) {
         B.a = 1, B.c = 2;
@@ -62,7 +62,7 @@ define(["require", "exports"], function (require, exports) {
         function D() {
         }
         return D;
-    })();
+    }());
     exports.e1 = new D;
     exports.f1 = new D;
     exports.g1 = new D;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
index 047b22c2ce1d9..f986ef7f36b72 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
@@ -43,7 +43,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B;
 (function (B) {
     B.a = 1, B.c = 2;
@@ -61,7 +61,7 @@ var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 exports.e1 = new D;
 exports.f1 = new D;
 exports.g1 = new D;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesSystem.js b/tests/baselines/reference/exportNonInitializedVariablesSystem.js
index c2b78f35cc2e8..b5674bf5ce306 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesSystem.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.js
@@ -46,7 +46,7 @@ System.register([], function(exports_1) {
                 function A() {
                 }
                 return A;
-            })();
+            }());
             (function (B) {
                 B.a = 1, B.c = 2;
             })(B || (B = {}));
@@ -62,7 +62,7 @@ System.register([], function(exports_1) {
                 function D() {
                 }
                 return D;
-            })();
+            }());
             exports_1("e1", e1 = new D);
             exports_1("f1", f1 = new D);
             exports_1("g1", g1 = new D);
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
index 2567fb57ecfe2..772f63205b692 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
@@ -51,7 +51,7 @@ export let h1: D = new D;
         function A() {
         }
         return A;
-    })();
+    }());
     var B;
     (function (B) {
         B.a = 1, B.c = 2;
@@ -69,7 +69,7 @@ export let h1: D = new D;
         function D() {
         }
         return D;
-    })();
+    }());
     exports.e1 = new D;
     exports.f1 = new D;
     exports.g1 = new D;
diff --git a/tests/baselines/reference/exportNonVisibleType.js b/tests/baselines/reference/exportNonVisibleType.js
index ad2b2a9d910a8..6208c164be8cf 100644
--- a/tests/baselines/reference/exportNonVisibleType.js
+++ b/tests/baselines/reference/exportNonVisibleType.js
@@ -45,7 +45,7 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 module.exports = C1;
 //// [foo3.js]
 "use strict";
@@ -53,5 +53,5 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 module.exports = C1;
diff --git a/tests/baselines/reference/exportPrivateType.js b/tests/baselines/reference/exportPrivateType.js
index 14267730dfb76..efdd7cb8e6ee8 100644
--- a/tests/baselines/reference/exportPrivateType.js
+++ b/tests/baselines/reference/exportPrivateType.js
@@ -37,12 +37,12 @@ var foo;
         function C1() {
         }
         return C1;
-    })();
+    }());
     var C2 = (function () {
         function C2() {
         }
         C2.prototype.test = function () { return true; };
         return C2;
-    })();
+    }());
 })(foo || (foo = {}));
 var y = foo.g; // Exported variable 'y' has or is using private type 'foo.C2'.
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index e131d5ae8d986..afb4d2f10c1bc 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -29,7 +29,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 exports.A = A;
 //// [exportStarFromEmptyModule_module2.js]
 // empty
@@ -44,7 +44,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 exports.A = A;
 //// [exportStarFromEmptyModule_module4.js]
 "use strict";
diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js
index f4c7e97b29729..a49cd744441d5 100644
--- a/tests/baselines/reference/exportVisibility.js
+++ b/tests/baselines/reference/exportVisibility.js
@@ -15,7 +15,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 exports.Foo = Foo;
 exports.foo = new Foo();
 function test(foo) {
diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js
index 0742731636a94..f2d78fe9a8884 100644
--- a/tests/baselines/reference/exportingContainingVisibleType.js
+++ b/tests/baselines/reference/exportingContainingVisibleType.js
@@ -25,6 +25,6 @@ define(["require", "exports"], function (require, exports) {
             configurable: true
         });
         return Foo;
-    })();
+    }());
     exports.x = 5;
 });
diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js
index 555a56ce31f0e..9e04b3485d205 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.js
+++ b/tests/baselines/reference/exportsAndImports1-amd.js
@@ -45,7 +45,7 @@ define(["require", "exports"], function (require, exports) {
         function C() {
         }
         return C;
-    })();
+    }());
     exports.C = C;
     var E;
     (function (E) {
diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js
index 312b379dde1f8..46eda0656ad8c 100644
--- a/tests/baselines/reference/exportsAndImports1.js
+++ b/tests/baselines/reference/exportsAndImports1.js
@@ -44,7 +44,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 exports.C = C;
 var E;
 (function (E) {
diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js
index be86b9ba7b8fb..0e315f1f18b23 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.js
+++ b/tests/baselines/reference/exportsAndImports3-amd.js
@@ -46,7 +46,7 @@ define(["require", "exports"], function (require, exports) {
         function C() {
         }
         return C;
-    })();
+    }());
     exports.C = C;
     exports.C1 = C;
     (function (E) {
diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js
index e29f403a5e0fe..16115a192da28 100644
--- a/tests/baselines/reference/exportsAndImports3.js
+++ b/tests/baselines/reference/exportsAndImports3.js
@@ -45,7 +45,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 exports.C = C;
 exports.C1 = C;
 (function (E) {
diff --git a/tests/baselines/reference/extBaseClass1.js b/tests/baselines/reference/extBaseClass1.js
index 07923eccc889c..446c6df9c94d9 100644
--- a/tests/baselines/reference/extBaseClass1.js
+++ b/tests/baselines/reference/extBaseClass1.js
@@ -32,7 +32,7 @@ var M;
             this.x = 10;
         }
         return B;
-    })();
+    }());
     M.B = B;
     var C = (function (_super) {
         __extends(C, _super);
@@ -40,7 +40,7 @@ var M;
             _super.apply(this, arguments);
         }
         return C;
-    })(B);
+    }(B));
     M.C = C;
 })(M || (M = {}));
 var M;
@@ -51,7 +51,7 @@ var M;
             _super.apply(this, arguments);
         }
         return C2;
-    })(M.B);
+    }(M.B));
     M.C2 = C2;
 })(M || (M = {}));
 var N;
@@ -62,6 +62,6 @@ var N;
             _super.apply(this, arguments);
         }
         return C3;
-    })(M.B);
+    }(M.B));
     N.C3 = C3;
 })(N || (N = {}));
diff --git a/tests/baselines/reference/extBaseClass2.js b/tests/baselines/reference/extBaseClass2.js
index 6e9972c3f2919..f7bd85d685c25 100644
--- a/tests/baselines/reference/extBaseClass2.js
+++ b/tests/baselines/reference/extBaseClass2.js
@@ -24,7 +24,7 @@ var N;
             _super.apply(this, arguments);
         }
         return C4;
-    })(M.B);
+    }(M.B));
     N.C4 = C4;
 })(N || (N = {}));
 var M;
@@ -35,6 +35,6 @@ var M;
             _super.apply(this, arguments);
         }
         return C5;
-    })(B);
+    }(B));
     M.C5 = C5;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType.js b/tests/baselines/reference/extendAndImplementTheSameBaseType.js
index 6a631ceebf8f5..e52e5b497acce 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType.js
@@ -24,7 +24,7 @@ var C = (function () {
     }
     C.prototype.bar = function () { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -32,7 +32,7 @@ var D = (function (_super) {
     }
     D.prototype.baz = function () { };
     return D;
-})(C);
+}(C));
 var c;
 var d = new D();
 d.bar();
diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
index 42cf785c0b0ee..1f4f62a42ee82 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
@@ -29,7 +29,7 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -37,7 +37,7 @@ var D = (function (_super) {
     }
     D.prototype.baz = function () { };
     return D;
-})(C);
+}(C));
 var d = new D();
 var r = d.foo;
 var r2 = d.foo;
diff --git a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
index d8c54b58d7e13..d598389d0fa2a 100644
--- a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
+++ b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
@@ -15,10 +15,10 @@ var derived = (function (_super) {
         _super.apply(this, arguments);
     }
     return derived;
-})(base);
+}(base));
 var base = (function () {
     function base(n) {
         this.n = n;
     }
     return base;
-})();
+}());
diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js
index 0c137f54486e5..56b54d2821f5c 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -17,7 +17,7 @@ var x = (function () {
     function x() {
     }
     return x;
-})();
+}());
 module.exports = x;
 //// [foo2.js]
 "use strict";
@@ -34,4 +34,4 @@ var y = (function (_super) {
         _super.apply(this, arguments);
     }
     return y;
-})(x);
+}(x));
diff --git a/tests/baselines/reference/extendConstructSignatureInInterface.js b/tests/baselines/reference/extendConstructSignatureInInterface.js
index c440872a56699..20f43a948b895 100644
--- a/tests/baselines/reference/extendConstructSignatureInInterface.js
+++ b/tests/baselines/reference/extendConstructSignatureInInterface.js
@@ -23,5 +23,5 @@ var E = (function (_super) {
         _super.apply(this, arguments);
     }
     return E;
-})(CStatic);
+}(CStatic));
 var e = new E(1);
diff --git a/tests/baselines/reference/extendNonClassSymbol1.js b/tests/baselines/reference/extendNonClassSymbol1.js
index 2940868606889..558e6d6ba5773 100644
--- a/tests/baselines/reference/extendNonClassSymbol1.js
+++ b/tests/baselines/reference/extendNonClassSymbol1.js
@@ -14,7 +14,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 var x = A;
 var C = (function (_super) {
     __extends(C, _super);
@@ -22,4 +22,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(x); // error, could not find symbol xs
+}(x)); // error, could not find symbol xs
diff --git a/tests/baselines/reference/extendNonClassSymbol2.js b/tests/baselines/reference/extendNonClassSymbol2.js
index a65eeca612a7e..3785c7c58469e 100644
--- a/tests/baselines/reference/extendNonClassSymbol2.js
+++ b/tests/baselines/reference/extendNonClassSymbol2.js
@@ -21,4 +21,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(Foo); // error, could not find symbol Foo
+}(Foo)); // error, could not find symbol Foo
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
index 004c89be3fbb5..6542492e200cf 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -38,7 +38,7 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 exports.Model = Model;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js]
 "use strict";
@@ -54,7 +54,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js]
 "use strict";
@@ -70,7 +70,7 @@ var VisualizationModel = (function (_super) {
         _super.apply(this, arguments);
     }
     return VisualizationModel;
-})(Backbone.Model);
+}(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
 //// [extendingClassFromAliasAndUsageInIndexer_main.js]
 "use strict";
diff --git a/tests/baselines/reference/extendsClauseAlreadySeen.js b/tests/baselines/reference/extendsClauseAlreadySeen.js
index ed6602c116a91..fb9a3f1237858 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen.js
@@ -16,7 +16,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -24,4 +24,4 @@ var D = (function (_super) {
     }
     D.prototype.baz = function () { };
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/extendsClauseAlreadySeen2.js b/tests/baselines/reference/extendsClauseAlreadySeen2.js
index 2c77f4e673f78..9423789dd3538 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen2.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen2.js
@@ -16,7 +16,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -24,4 +24,4 @@ var D = (function (_super) {
     }
     D.prototype.baz = function () { };
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/externModule.js b/tests/baselines/reference/externModule.js
index bf175f0eeffd6..d5684ea1f46b5 100644
--- a/tests/baselines/reference/externModule.js
+++ b/tests/baselines/reference/externModule.js
@@ -47,7 +47,7 @@ module;
         function XDate() {
         }
         return XDate;
-    })();
+    }());
     exports.XDate = XDate;
 }
 var d = new XDate();
diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js
index dc74c9446e251..e621b7c930b6b 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.js
+++ b/tests/baselines/reference/externalModuleAssignToVar.js
@@ -33,7 +33,7 @@ define(["require", "exports"], function (require, exports) {
         function C() {
         }
         return C;
-    })();
+    }());
     exports.C = C;
 });
 //// [externalModuleAssignToVar_core_require2.js]
@@ -43,7 +43,7 @@ define(["require", "exports"], function (require, exports) {
         function C() {
         }
         return C;
-    })();
+    }());
     return C;
 });
 //// [externalModuleAssignToVar_ext.js]
@@ -53,7 +53,7 @@ define(["require", "exports"], function (require, exports) {
         function D() {
         }
         return D;
-    })();
+    }());
     return D;
 });
 //// [externalModuleAssignToVar_core.js]
diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js
index 78608c08c5692..c4b8556bb80b4 100644
--- a/tests/baselines/reference/externalModuleExportingGenericClass.js
+++ b/tests/baselines/reference/externalModuleExportingGenericClass.js
@@ -21,7 +21,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 module.exports = C;
 //// [externalModuleExportingGenericClass_file1.js]
 "use strict";
diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js
index 3f9978c7b0ae6..26255ac3fcd13 100644
--- a/tests/baselines/reference/externalModuleQualification.js
+++ b/tests/baselines/reference/externalModuleQualification.js
@@ -19,7 +19,7 @@ var DiffEditor = (function () {
         if (id === void 0) { id = exports.ID; }
     }
     return DiffEditor;
-})();
+}());
 exports.DiffEditor = DiffEditor;
 var NavigateAction = (function () {
     function NavigateAction() {
@@ -27,4 +27,4 @@ var NavigateAction = (function () {
     NavigateAction.prototype.f = function (editor) {
     };
     return NavigateAction;
-})();
+}());
diff --git a/tests/baselines/reference/fatArrowSelf.js b/tests/baselines/reference/fatArrowSelf.js
index 7648cb28a4b47..db9aaa347dc39 100644
--- a/tests/baselines/reference/fatArrowSelf.js
+++ b/tests/baselines/reference/fatArrowSelf.js
@@ -33,7 +33,7 @@ var Events;
         EventEmitter.prototype.addListener = function (type, listener) {
         };
         return EventEmitter;
-    })();
+    }());
     Events.EventEmitter = EventEmitter;
 })(Events || (Events = {}));
 var Consumer;
@@ -51,5 +51,5 @@ var Consumer;
         EventEmitterConsummer.prototype.changed = function () {
         };
         return EventEmitterConsummer;
-    })();
+    }());
 })(Consumer || (Consumer = {}));
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js
index a43e9cf0a1b13..eb5171acd75cb 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.js
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.js
@@ -16,6 +16,6 @@ define(["require", "exports"], function (require, exports) {
             configurable: true
         });
         return C;
-    })();
+    }());
     exports.C = C;
 });
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
index d8513e6731c38..0c6f1c8034dc1 100644
--- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
+++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
@@ -16,7 +16,7 @@ define("a", ["require", "exports"], function (require, exports) {
         function c() {
         }
         return c;
-    })();
+    }());
     exports.c = c;
 });
 function foo() {
diff --git a/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.js b/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.js
index ce91d4616f4d3..af0a1e7a63b24 100644
--- a/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.js
+++ b/tests/baselines/reference/fillInMissingTypeArgsOnConstructCalls.js
@@ -10,5 +10,5 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var a = new A();
diff --git a/tests/baselines/reference/fluentClasses.js b/tests/baselines/reference/fluentClasses.js
index 12f3cfff48dba..3d5efcc1b1a64 100644
--- a/tests/baselines/reference/fluentClasses.js
+++ b/tests/baselines/reference/fluentClasses.js
@@ -31,7 +31,7 @@ var A = (function () {
         return this;
     };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -41,7 +41,7 @@ var B = (function (_super) {
         return this;
     };
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -51,6 +51,6 @@ var C = (function (_super) {
         return this;
     };
     return C;
-})(B);
+}(B));
 var c;
 var z = c.foo().bar().baz(); // Fluent pattern
diff --git a/tests/baselines/reference/for-inStatements.js b/tests/baselines/reference/for-inStatements.js
index d735a37ba972a..5c097a68ccc3b 100644
--- a/tests/baselines/reference/for-inStatements.js
+++ b/tests/baselines/reference/for-inStatements.js
@@ -122,7 +122,7 @@ var A = (function () {
         return null;
     };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -137,7 +137,7 @@ var B = (function (_super) {
         return null;
     };
     return B;
-})(A);
+}(A));
 var i;
 for (var x in i[42]) { }
 var M;
@@ -146,7 +146,7 @@ var M;
         function X() {
         }
         return X;
-    })();
+    }());
     M.X = X;
 })(M || (M = {}));
 for (var x in M) { }
diff --git a/tests/baselines/reference/for-inStatementsInvalid.js b/tests/baselines/reference/for-inStatementsInvalid.js
index 93b9fb9b97f9e..caec9bd1987ce 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.js
+++ b/tests/baselines/reference/for-inStatementsInvalid.js
@@ -103,7 +103,7 @@ var A = (function () {
         return null;
     };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -118,6 +118,6 @@ var B = (function (_super) {
         return null;
     };
     return B;
-})(A);
+}(A));
 var i;
 for (var x in i[42]) { }
diff --git a/tests/baselines/reference/forStatements.js b/tests/baselines/reference/forStatements.js
index 253fafc81e85c..c380185ecf56c 100644
--- a/tests/baselines/reference/forStatements.js
+++ b/tests/baselines/reference/forStatements.js
@@ -52,12 +52,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 function F(x) { return 42; }
 var M;
 (function (M) {
@@ -65,7 +65,7 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     function F2(x) { return x.toString(); }
     M.F2 = F2;
diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
index 20639c687cbf6..aff01bc85655a 100644
--- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
+++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
@@ -64,19 +64,19 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(C);
+}(C));
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 function F(x) { return 42; }
 var M;
 (function (M) {
@@ -84,7 +84,7 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     function F2(x) { return x.toString(); }
     M.F2 = F2;
diff --git a/tests/baselines/reference/forgottenNew.js b/tests/baselines/reference/forgottenNew.js
index 72b0537882ea6..927f21a04df48 100644
--- a/tests/baselines/reference/forgottenNew.js
+++ b/tests/baselines/reference/forgottenNew.js
@@ -12,7 +12,7 @@ var Tools;
         function NullLogger() {
         }
         return NullLogger;
-    })();
+    }());
     Tools.NullLogger = NullLogger;
 })(Tools || (Tools = {}));
 var logger = Tools.NullLogger();
diff --git a/tests/baselines/reference/funClodule.js b/tests/baselines/reference/funClodule.js
index cc7dba7e476aa..8ea98ad74872c 100644
--- a/tests/baselines/reference/funClodule.js
+++ b/tests/baselines/reference/funClodule.js
@@ -30,4 +30,4 @@ var foo3 = (function () {
     function foo3() {
     }
     return foo3;
-})(); // Should error
+}()); // Should error
diff --git a/tests/baselines/reference/functionAndPropertyNameConflict.js b/tests/baselines/reference/functionAndPropertyNameConflict.js
index 28a2cd54c9e92..bd3b5b7243d8e 100644
--- a/tests/baselines/reference/functionAndPropertyNameConflict.js
+++ b/tests/baselines/reference/functionAndPropertyNameConflict.js
@@ -19,4 +19,4 @@ var C65 = (function () {
         configurable: true
     });
     return C65;
-})();
+}());
diff --git a/tests/baselines/reference/functionArgShadowing.js b/tests/baselines/reference/functionArgShadowing.js
index 451e46536e05f..bae1365a789d9 100644
--- a/tests/baselines/reference/functionArgShadowing.js
+++ b/tests/baselines/reference/functionArgShadowing.js
@@ -20,13 +20,13 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.bar = function () { };
     return B;
-})();
+}());
 function foo(x) {
     var x = new B();
     x.bar(); // the property bar does not exist on a value of type A
@@ -38,4 +38,4 @@ var C = (function () {
         var n = p;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/functionCall5.js b/tests/baselines/reference/functionCall5.js
index dc7db4a995969..4eccd50ed3c37 100644
--- a/tests/baselines/reference/functionCall5.js
+++ b/tests/baselines/reference/functionCall5.js
@@ -10,7 +10,7 @@ var m1;
         function c1() {
         }
         return c1;
-    })();
+    }());
     m1.c1 = c1;
 })(m1 || (m1 = {}));
 function foo() { return new m1.c1(); }
diff --git a/tests/baselines/reference/functionCall7.js b/tests/baselines/reference/functionCall7.js
index cb30e5d8b244f..68e9e4af77a18 100644
--- a/tests/baselines/reference/functionCall7.js
+++ b/tests/baselines/reference/functionCall7.js
@@ -15,7 +15,7 @@ var m1;
         function c1() {
         }
         return c1;
-    })();
+    }());
     m1.c1 = c1;
 })(m1 || (m1 = {}));
 function foo(a) { a.a = 1; }
diff --git a/tests/baselines/reference/functionConstraintSatisfaction.js b/tests/baselines/reference/functionConstraintSatisfaction.js
index b87414561783b..eb654b1a2a29c 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction.js
+++ b/tests/baselines/reference/functionConstraintSatisfaction.js
@@ -69,7 +69,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b;
 var c;
@@ -87,7 +87,7 @@ var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var a2;
 var b2;
 var c2;
diff --git a/tests/baselines/reference/functionConstraintSatisfaction2.js b/tests/baselines/reference/functionConstraintSatisfaction2.js
index 9e70a508ccd3d..ccbfbc70aba7d 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction2.js
+++ b/tests/baselines/reference/functionConstraintSatisfaction2.js
@@ -51,13 +51,13 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var b;
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var b2;
 var r = foo2(new Function());
 var r2 = foo2(function (x) { return x; });
diff --git a/tests/baselines/reference/functionConstraintSatisfaction3.js b/tests/baselines/reference/functionConstraintSatisfaction3.js
index 2c1bfa4d399ac..fee12434eeed2 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction3.js
+++ b/tests/baselines/reference/functionConstraintSatisfaction3.js
@@ -49,7 +49,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b;
 var c;
@@ -64,7 +64,7 @@ var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var a2;
 var b2;
 var c2;
diff --git a/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js b/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js
index fe10f96f7bb67..be2aa29460a03 100644
--- a/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js
+++ b/tests/baselines/reference/functionExpressionAndLambdaMatchesFunction.js
@@ -18,4 +18,4 @@ var CDoc = (function () {
         doSomething(function () { });
     }
     return CDoc;
-})();
+}());
diff --git a/tests/baselines/reference/functionExpressionContextualTyping1.js b/tests/baselines/reference/functionExpressionContextualTyping1.js
index 8d60572b30f74..9592af7138c43 100644
--- a/tests/baselines/reference/functionExpressionContextualTyping1.js
+++ b/tests/baselines/reference/functionExpressionContextualTyping1.js
@@ -75,7 +75,7 @@ var Class = (function () {
     }
     Class.prototype.foo = function () { };
     return Class;
-})();
+}());
 var a1 = function (a1) {
     a1.foo();
     return 1;
@@ -117,4 +117,4 @@ var C = (function () {
         }; // Per spec, no contextual signature can be extracted in this case.
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/functionImplementationErrors.js b/tests/baselines/reference/functionImplementationErrors.js
index 4436f1bc94f3f..2dc6c8a1bc442 100644
--- a/tests/baselines/reference/functionImplementationErrors.js
+++ b/tests/baselines/reference/functionImplementationErrors.js
@@ -125,26 +125,26 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var AnotherClass = (function () {
     function AnotherClass() {
     }
     return AnotherClass;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
         _super.apply(this, arguments);
     }
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 function f8() {
     return new Derived1();
     return new Derived2();
diff --git a/tests/baselines/reference/functionImplementations.js b/tests/baselines/reference/functionImplementations.js
index 512da960b78d6..6e37f929efef7 100644
--- a/tests/baselines/reference/functionImplementations.js
+++ b/tests/baselines/reference/functionImplementations.js
@@ -232,14 +232,14 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var b;
 var b = function () {
     return new Base();
@@ -290,12 +290,12 @@ var Derived2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 var AnotherClass = (function () {
     function AnotherClass() {
     }
     return AnotherClass;
-})();
+}());
 // if f is a contextually typed function expression, the inferred return type is the union type
 // of the types of the return statement expressions in the function body, 
 // ignoring return statements with no expressions.
diff --git a/tests/baselines/reference/functionLiteralForOverloads2.js b/tests/baselines/reference/functionLiteralForOverloads2.js
index f374dfb4599c9..ed6bdcf784197 100644
--- a/tests/baselines/reference/functionLiteralForOverloads2.js
+++ b/tests/baselines/reference/functionLiteralForOverloads2.js
@@ -34,12 +34,12 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x) {
     }
     return D;
-})();
+}());
 var f = C;
 var f2 = C;
 var f3 = D;
diff --git a/tests/baselines/reference/functionOverloadErrors.js b/tests/baselines/reference/functionOverloadErrors.js
index b0c0f44945618..a07f04ae9a8be 100644
--- a/tests/baselines/reference/functionOverloadErrors.js
+++ b/tests/baselines/reference/functionOverloadErrors.js
@@ -141,7 +141,7 @@ var cls = (function () {
     cls.prototype.f = function () { };
     cls.prototype.g = function () { };
     return cls;
-})();
+}());
 //Function overloads with differing export
 var M;
 (function (M) {
diff --git a/tests/baselines/reference/functionOverloads5.js b/tests/baselines/reference/functionOverloads5.js
index b59154d2417bf..f23c66f3bebef 100644
--- a/tests/baselines/reference/functionOverloads5.js
+++ b/tests/baselines/reference/functionOverloads5.js
@@ -11,4 +11,4 @@ var baz = (function () {
     }
     baz.prototype.foo = function (bar) { };
     return baz;
-})();
+}());
diff --git a/tests/baselines/reference/functionOverloads6.js b/tests/baselines/reference/functionOverloads6.js
index 2c19b376dc8c1..442708ca71824 100644
--- a/tests/baselines/reference/functionOverloads6.js
+++ b/tests/baselines/reference/functionOverloads6.js
@@ -12,4 +12,4 @@ var foo = (function () {
     }
     foo.fnOverload = function (foo) { };
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/functionOverloads7.js b/tests/baselines/reference/functionOverloads7.js
index 540abf9eb8c39..4d807d57548ce 100644
--- a/tests/baselines/reference/functionOverloads7.js
+++ b/tests/baselines/reference/functionOverloads7.js
@@ -20,4 +20,4 @@ var foo = (function () {
         foo = this.bar("test");
     };
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/functionOverloadsOutOfOrder.js b/tests/baselines/reference/functionOverloadsOutOfOrder.js
index 32d69fb72ffc2..f675646fed76f 100644
--- a/tests/baselines/reference/functionOverloadsOutOfOrder.js
+++ b/tests/baselines/reference/functionOverloadsOutOfOrder.js
@@ -23,7 +23,7 @@ var d = (function () {
         return ns.toString();
     };
     return d;
-})();
+}());
 var e = (function () {
     function e() {
     }
@@ -31,4 +31,4 @@ var e = (function () {
         return ns.toString();
     };
     return e;
-})();
+}());
diff --git a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js
index ab0baf2059296..1d38d65ad38b4 100644
--- a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js
+++ b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.js
@@ -19,12 +19,12 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 function Choice() {
     var v_args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
diff --git a/tests/baselines/reference/functionSubtypingOfVarArgs.js b/tests/baselines/reference/functionSubtypingOfVarArgs.js
index ddcb057090813..7485abe192735 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs.js
@@ -28,7 +28,7 @@ var EventBase = (function () {
         this._listeners.push(listener);
     };
     return EventBase;
-})();
+}());
 var StringEvent = (function (_super) {
     __extends(StringEvent, _super);
     function StringEvent() {
@@ -38,4 +38,4 @@ var StringEvent = (function (_super) {
         _super.prototype.add.call(this, listener);
     };
     return StringEvent;
-})(EventBase);
+}(EventBase));
diff --git a/tests/baselines/reference/functionSubtypingOfVarArgs2.js b/tests/baselines/reference/functionSubtypingOfVarArgs2.js
index d04a5b97daecd..33d0e8c7e03e9 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs2.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs2.js
@@ -28,7 +28,7 @@ var EventBase = (function () {
         this._listeners.push(listener);
     };
     return EventBase;
-})();
+}());
 var StringEvent = (function (_super) {
     __extends(StringEvent, _super);
     function StringEvent() {
@@ -38,4 +38,4 @@ var StringEvent = (function (_super) {
         _super.prototype.add.call(this, listener);
     };
     return StringEvent;
-})(EventBase);
+}(EventBase));
diff --git a/tests/baselines/reference/functionWithSameNameAsField.js b/tests/baselines/reference/functionWithSameNameAsField.js
index cc9b6b12d44c9..f4b328e4c5b5f 100644
--- a/tests/baselines/reference/functionWithSameNameAsField.js
+++ b/tests/baselines/reference/functionWithSameNameAsField.js
@@ -17,4 +17,4 @@ var TestProgressBar = (function () {
         return this;
     };
     return TestProgressBar;
-})();
+}());
diff --git a/tests/baselines/reference/functionsInClassExpressions.js b/tests/baselines/reference/functionsInClassExpressions.js
index debd8138831e1..616e6a3251ca2 100644
--- a/tests/baselines/reference/functionsInClassExpressions.js
+++ b/tests/baselines/reference/functionsInClassExpressions.js
@@ -22,4 +22,4 @@ var Foo = (function () {
     }
     class_1.prototype.m = function () { return this.bar; };
     return class_1;
-})();
+}());
diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js
index f76e5342aee29..4dfe851683ac9 100644
--- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js
+++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.js
@@ -236,4 +236,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/fuzzy.js b/tests/baselines/reference/fuzzy.js
index b98a9ced1074d..af2bda7433902 100644
--- a/tests/baselines/reference/fuzzy.js
+++ b/tests/baselines/reference/fuzzy.js
@@ -47,6 +47,6 @@ var M;
             return ({ oneI: this });
         };
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/generatedContextualTyping.js b/tests/baselines/reference/generatedContextualTyping.js
index a867d4b762933..8093c8bec4195 100644
--- a/tests/baselines/reference/generatedContextualTyping.js
+++ b/tests/baselines/reference/generatedContextualTyping.js
@@ -365,21 +365,21 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
         _super.apply(this, arguments);
     }
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 var b = new Base(), d1 = new Derived1(), d2 = new Derived2();
 var x1 = function () { return [d1, d2]; };
 var x2 = function () { return [d1, d2]; };
@@ -398,673 +398,673 @@ var x13 = (function () {
         this.member = function () { return [d1, d2]; };
     }
     return x13;
-})();
+}());
 var x14 = (function () {
     function x14() {
         this.member = function () { return [d1, d2]; };
     }
     return x14;
-})();
+}());
 var x15 = (function () {
     function x15() {
         this.member = function named() { return [d1, d2]; };
     }
     return x15;
-})();
+}());
 var x16 = (function () {
     function x16() {
         this.member = function () { return [d1, d2]; };
     }
     return x16;
-})();
+}());
 var x17 = (function () {
     function x17() {
         this.member = function () { return [d1, d2]; };
     }
     return x17;
-})();
+}());
 var x18 = (function () {
     function x18() {
         this.member = function named() { return [d1, d2]; };
     }
     return x18;
-})();
+}());
 var x19 = (function () {
     function x19() {
         this.member = [d1, d2];
     }
     return x19;
-})();
+}());
 var x20 = (function () {
     function x20() {
         this.member = [d1, d2];
     }
     return x20;
-})();
+}());
 var x21 = (function () {
     function x21() {
         this.member = [d1, d2];
     }
     return x21;
-})();
+}());
 var x22 = (function () {
     function x22() {
         this.member = { n: [d1, d2] };
     }
     return x22;
-})();
+}());
 var x23 = (function () {
     function x23() {
         this.member = function (n) { var n; return null; };
     }
     return x23;
-})();
+}());
 var x24 = (function () {
     function x24() {
         this.member = { func: function (n) { return [d1, d2]; } };
     }
     return x24;
-})();
+}());
 var x25 = (function () {
     function x25() {
         this.member = function () { return [d1, d2]; };
     }
     return x25;
-})();
+}());
 var x26 = (function () {
     function x26() {
         this.member = function () { return [d1, d2]; };
     }
     return x26;
-})();
+}());
 var x27 = (function () {
     function x27() {
         this.member = function named() { return [d1, d2]; };
     }
     return x27;
-})();
+}());
 var x28 = (function () {
     function x28() {
         this.member = function () { return [d1, d2]; };
     }
     return x28;
-})();
+}());
 var x29 = (function () {
     function x29() {
         this.member = function () { return [d1, d2]; };
     }
     return x29;
-})();
+}());
 var x30 = (function () {
     function x30() {
         this.member = function named() { return [d1, d2]; };
     }
     return x30;
-})();
+}());
 var x31 = (function () {
     function x31() {
         this.member = [d1, d2];
     }
     return x31;
-})();
+}());
 var x32 = (function () {
     function x32() {
         this.member = [d1, d2];
     }
     return x32;
-})();
+}());
 var x33 = (function () {
     function x33() {
         this.member = [d1, d2];
     }
     return x33;
-})();
+}());
 var x34 = (function () {
     function x34() {
         this.member = { n: [d1, d2] };
     }
     return x34;
-})();
+}());
 var x35 = (function () {
     function x35() {
         this.member = function (n) { var n; return null; };
     }
     return x35;
-})();
+}());
 var x36 = (function () {
     function x36() {
         this.member = { func: function (n) { return [d1, d2]; } };
     }
     return x36;
-})();
+}());
 var x37 = (function () {
     function x37() {
         this.member = function () { return [d1, d2]; };
     }
     return x37;
-})();
+}());
 var x38 = (function () {
     function x38() {
         this.member = function () { return [d1, d2]; };
     }
     return x38;
-})();
+}());
 var x39 = (function () {
     function x39() {
         this.member = function named() { return [d1, d2]; };
     }
     return x39;
-})();
+}());
 var x40 = (function () {
     function x40() {
         this.member = function () { return [d1, d2]; };
     }
     return x40;
-})();
+}());
 var x41 = (function () {
     function x41() {
         this.member = function () { return [d1, d2]; };
     }
     return x41;
-})();
+}());
 var x42 = (function () {
     function x42() {
         this.member = function named() { return [d1, d2]; };
     }
     return x42;
-})();
+}());
 var x43 = (function () {
     function x43() {
         this.member = [d1, d2];
     }
     return x43;
-})();
+}());
 var x44 = (function () {
     function x44() {
         this.member = [d1, d2];
     }
     return x44;
-})();
+}());
 var x45 = (function () {
     function x45() {
         this.member = [d1, d2];
     }
     return x45;
-})();
+}());
 var x46 = (function () {
     function x46() {
         this.member = { n: [d1, d2] };
     }
     return x46;
-})();
+}());
 var x47 = (function () {
     function x47() {
         this.member = function (n) { var n; return null; };
     }
     return x47;
-})();
+}());
 var x48 = (function () {
     function x48() {
         this.member = { func: function (n) { return [d1, d2]; } };
     }
     return x48;
-})();
+}());
 var x49 = (function () {
     function x49() {
     }
     x49.member = function () { return [d1, d2]; };
     return x49;
-})();
+}());
 var x50 = (function () {
     function x50() {
     }
     x50.member = function () { return [d1, d2]; };
     return x50;
-})();
+}());
 var x51 = (function () {
     function x51() {
     }
     x51.member = function named() { return [d1, d2]; };
     return x51;
-})();
+}());
 var x52 = (function () {
     function x52() {
     }
     x52.member = function () { return [d1, d2]; };
     return x52;
-})();
+}());
 var x53 = (function () {
     function x53() {
     }
     x53.member = function () { return [d1, d2]; };
     return x53;
-})();
+}());
 var x54 = (function () {
     function x54() {
     }
     x54.member = function named() { return [d1, d2]; };
     return x54;
-})();
+}());
 var x55 = (function () {
     function x55() {
     }
     x55.member = [d1, d2];
     return x55;
-})();
+}());
 var x56 = (function () {
     function x56() {
     }
     x56.member = [d1, d2];
     return x56;
-})();
+}());
 var x57 = (function () {
     function x57() {
     }
     x57.member = [d1, d2];
     return x57;
-})();
+}());
 var x58 = (function () {
     function x58() {
     }
     x58.member = { n: [d1, d2] };
     return x58;
-})();
+}());
 var x59 = (function () {
     function x59() {
     }
     x59.member = function (n) { var n; return null; };
     return x59;
-})();
+}());
 var x60 = (function () {
     function x60() {
     }
     x60.member = { func: function (n) { return [d1, d2]; } };
     return x60;
-})();
+}());
 var x61 = (function () {
     function x61() {
     }
     x61.member = function () { return [d1, d2]; };
     return x61;
-})();
+}());
 var x62 = (function () {
     function x62() {
     }
     x62.member = function () { return [d1, d2]; };
     return x62;
-})();
+}());
 var x63 = (function () {
     function x63() {
     }
     x63.member = function named() { return [d1, d2]; };
     return x63;
-})();
+}());
 var x64 = (function () {
     function x64() {
     }
     x64.member = function () { return [d1, d2]; };
     return x64;
-})();
+}());
 var x65 = (function () {
     function x65() {
     }
     x65.member = function () { return [d1, d2]; };
     return x65;
-})();
+}());
 var x66 = (function () {
     function x66() {
     }
     x66.member = function named() { return [d1, d2]; };
     return x66;
-})();
+}());
 var x67 = (function () {
     function x67() {
     }
     x67.member = [d1, d2];
     return x67;
-})();
+}());
 var x68 = (function () {
     function x68() {
     }
     x68.member = [d1, d2];
     return x68;
-})();
+}());
 var x69 = (function () {
     function x69() {
     }
     x69.member = [d1, d2];
     return x69;
-})();
+}());
 var x70 = (function () {
     function x70() {
     }
     x70.member = { n: [d1, d2] };
     return x70;
-})();
+}());
 var x71 = (function () {
     function x71() {
     }
     x71.member = function (n) { var n; return null; };
     return x71;
-})();
+}());
 var x72 = (function () {
     function x72() {
     }
     x72.member = { func: function (n) { return [d1, d2]; } };
     return x72;
-})();
+}());
 var x73 = (function () {
     function x73() {
     }
     x73.member = function () { return [d1, d2]; };
     return x73;
-})();
+}());
 var x74 = (function () {
     function x74() {
     }
     x74.member = function () { return [d1, d2]; };
     return x74;
-})();
+}());
 var x75 = (function () {
     function x75() {
     }
     x75.member = function named() { return [d1, d2]; };
     return x75;
-})();
+}());
 var x76 = (function () {
     function x76() {
     }
     x76.member = function () { return [d1, d2]; };
     return x76;
-})();
+}());
 var x77 = (function () {
     function x77() {
     }
     x77.member = function () { return [d1, d2]; };
     return x77;
-})();
+}());
 var x78 = (function () {
     function x78() {
     }
     x78.member = function named() { return [d1, d2]; };
     return x78;
-})();
+}());
 var x79 = (function () {
     function x79() {
     }
     x79.member = [d1, d2];
     return x79;
-})();
+}());
 var x80 = (function () {
     function x80() {
     }
     x80.member = [d1, d2];
     return x80;
-})();
+}());
 var x81 = (function () {
     function x81() {
     }
     x81.member = [d1, d2];
     return x81;
-})();
+}());
 var x82 = (function () {
     function x82() {
     }
     x82.member = { n: [d1, d2] };
     return x82;
-})();
+}());
 var x83 = (function () {
     function x83() {
     }
     x83.member = function (n) { var n; return null; };
     return x83;
-})();
+}());
 var x84 = (function () {
     function x84() {
     }
     x84.member = { func: function (n) { return [d1, d2]; } };
     return x84;
-})();
+}());
 var x85 = (function () {
     function x85(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
     }
     return x85;
-})();
+}());
 var x86 = (function () {
     function x86(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
     }
     return x86;
-})();
+}());
 var x87 = (function () {
     function x87(parm) {
         if (parm === void 0) { parm = function named() { return [d1, d2]; }; }
     }
     return x87;
-})();
+}());
 var x88 = (function () {
     function x88(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
     }
     return x88;
-})();
+}());
 var x89 = (function () {
     function x89(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
     }
     return x89;
-})();
+}());
 var x90 = (function () {
     function x90(parm) {
         if (parm === void 0) { parm = function named() { return [d1, d2]; }; }
     }
     return x90;
-})();
+}());
 var x91 = (function () {
     function x91(parm) {
         if (parm === void 0) { parm = [d1, d2]; }
     }
     return x91;
-})();
+}());
 var x92 = (function () {
     function x92(parm) {
         if (parm === void 0) { parm = [d1, d2]; }
     }
     return x92;
-})();
+}());
 var x93 = (function () {
     function x93(parm) {
         if (parm === void 0) { parm = [d1, d2]; }
     }
     return x93;
-})();
+}());
 var x94 = (function () {
     function x94(parm) {
         if (parm === void 0) { parm = { n: [d1, d2] }; }
     }
     return x94;
-})();
+}());
 var x95 = (function () {
     function x95(parm) {
         if (parm === void 0) { parm = function (n) { var n; return null; }; }
     }
     return x95;
-})();
+}());
 var x96 = (function () {
     function x96(parm) {
         if (parm === void 0) { parm = { func: function (n) { return [d1, d2]; } }; }
     }
     return x96;
-})();
+}());
 var x97 = (function () {
     function x97(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x97;
-})();
+}());
 var x98 = (function () {
     function x98(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x98;
-})();
+}());
 var x99 = (function () {
     function x99(parm) {
         if (parm === void 0) { parm = function named() { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x99;
-})();
+}());
 var x100 = (function () {
     function x100(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x100;
-})();
+}());
 var x101 = (function () {
     function x101(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x101;
-})();
+}());
 var x102 = (function () {
     function x102(parm) {
         if (parm === void 0) { parm = function named() { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x102;
-})();
+}());
 var x103 = (function () {
     function x103(parm) {
         if (parm === void 0) { parm = [d1, d2]; }
         this.parm = parm;
     }
     return x103;
-})();
+}());
 var x104 = (function () {
     function x104(parm) {
         if (parm === void 0) { parm = [d1, d2]; }
         this.parm = parm;
     }
     return x104;
-})();
+}());
 var x105 = (function () {
     function x105(parm) {
         if (parm === void 0) { parm = [d1, d2]; }
         this.parm = parm;
     }
     return x105;
-})();
+}());
 var x106 = (function () {
     function x106(parm) {
         if (parm === void 0) { parm = { n: [d1, d2] }; }
         this.parm = parm;
     }
     return x106;
-})();
+}());
 var x107 = (function () {
     function x107(parm) {
         if (parm === void 0) { parm = function (n) { var n; return null; }; }
         this.parm = parm;
     }
     return x107;
-})();
+}());
 var x108 = (function () {
     function x108(parm) {
         if (parm === void 0) { parm = { func: function (n) { return [d1, d2]; } }; }
         this.parm = parm;
     }
     return x108;
-})();
+}());
 var x109 = (function () {
     function x109(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x109;
-})();
+}());
 var x110 = (function () {
     function x110(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x110;
-})();
+}());
 var x111 = (function () {
     function x111(parm) {
         if (parm === void 0) { parm = function named() { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x111;
-})();
+}());
 var x112 = (function () {
     function x112(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x112;
-})();
+}());
 var x113 = (function () {
     function x113(parm) {
         if (parm === void 0) { parm = function () { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x113;
-})();
+}());
 var x114 = (function () {
     function x114(parm) {
         if (parm === void 0) { parm = function named() { return [d1, d2]; }; }
         this.parm = parm;
     }
     return x114;
-})();
+}());
 var x115 = (function () {
     function x115(parm) {
         if (parm === void 0) { parm = [d1, d2]; }
         this.parm = parm;
     }
     return x115;
-})();
+}());
 var x116 = (function () {
     function x116(parm) {
         if (parm === void 0) { parm = [d1, d2]; }
         this.parm = parm;
     }
     return x116;
-})();
+}());
 var x117 = (function () {
     function x117(parm) {
         if (parm === void 0) { parm = [d1, d2]; }
         this.parm = parm;
     }
     return x117;
-})();
+}());
 var x118 = (function () {
     function x118(parm) {
         if (parm === void 0) { parm = { n: [d1, d2] }; }
         this.parm = parm;
     }
     return x118;
-})();
+}());
 var x119 = (function () {
     function x119(parm) {
         if (parm === void 0) { parm = function (n) { var n; return null; }; }
         this.parm = parm;
     }
     return x119;
-})();
+}());
 var x120 = (function () {
     function x120(parm) {
         if (parm === void 0) { parm = { func: function (n) { return [d1, d2]; } }; }
         this.parm = parm;
     }
     return x120;
-})();
+}());
 function x121(parm) {
     if (parm === void 0) { parm = function () { return [d1, d2]; }; }
 }
diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.js b/tests/baselines/reference/generativeRecursionWithTypeOf.js
index 2b7eebfd11cde..5a2ee9a0f1a39 100644
--- a/tests/baselines/reference/generativeRecursionWithTypeOf.js
+++ b/tests/baselines/reference/generativeRecursionWithTypeOf.js
@@ -16,7 +16,7 @@ var C = (function () {
     }
     C.foo = function (x) { };
     return C;
-})();
+}());
 var M;
 (function (M) {
     function f(x) {
diff --git a/tests/baselines/reference/genericArrayWithoutTypeAnnotation.js b/tests/baselines/reference/genericArrayWithoutTypeAnnotation.js
index 88f9713c3fe81..2a5177ca25566 100644
--- a/tests/baselines/reference/genericArrayWithoutTypeAnnotation.js
+++ b/tests/baselines/reference/genericArrayWithoutTypeAnnotation.js
@@ -14,4 +14,4 @@ var Bar = (function () {
     Bar.prototype.getBar = function (foo) {
     };
     return Bar;
-})();
+}());
diff --git a/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js b/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js
index 70f70ae07bae8..81d65dbbbb419 100644
--- a/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js
+++ b/tests/baselines/reference/genericAssignmentCompatWithInterfaces1.js
@@ -25,7 +25,7 @@ var A = (function () {
     }
     A.prototype.compareTo = function (other) { return 1; };
     return A;
-})();
+}());
 var z = { x: new A() };
 var a1 = { x: new A() };
 var a2 = function () {
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty.js b/tests/baselines/reference/genericBaseClassLiteralProperty.js
index f8a5f78e7533c..5aa43d78826a6 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty.js
@@ -22,7 +22,7 @@ var BaseClass = (function () {
     function BaseClass() {
     }
     return BaseClass;
-})();
+}());
 var SubClass = (function (_super) {
     __extends(SubClass, _super);
     function SubClass() {
@@ -33,4 +33,4 @@ var SubClass = (function (_super) {
         var y = this._getValue2();
     };
     return SubClass;
-})(BaseClass);
+}(BaseClass));
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty2.js b/tests/baselines/reference/genericBaseClassLiteralProperty2.js
index d5c480955d892..3226f1cd6595b 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty2.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.js
@@ -25,13 +25,13 @@ var CollectionItem2 = (function () {
     function CollectionItem2() {
     }
     return CollectionItem2;
-})();
+}());
 var BaseCollection2 = (function () {
     function BaseCollection2() {
         this._itemsByKey = {};
     }
     return BaseCollection2;
-})();
+}());
 var DataView2 = (function (_super) {
     __extends(DataView2, _super);
     function DataView2() {
@@ -41,4 +41,4 @@ var DataView2 = (function (_super) {
         this._itemsByKey['dummy'] = item;
     };
     return DataView2;
-})(BaseCollection2);
+}(BaseCollection2));
diff --git a/tests/baselines/reference/genericCallTypeArgumentInference.js b/tests/baselines/reference/genericCallTypeArgumentInference.js
index cfa366e5e2b49..994b4a52e6096 100644
--- a/tests/baselines/reference/genericCallTypeArgumentInference.js
+++ b/tests/baselines/reference/genericCallTypeArgumentInference.js
@@ -139,7 +139,7 @@ var C = (function () {
         return x;
     };
     return C;
-})();
+}());
 var c = new C('', 1);
 var r4 = c.foo('', 1); // string
 var r5 = c.foo2('', 1); // number
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
index 9df55756ee22a..04d5bd2d99794 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
@@ -118,21 +118,21 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var b;
 var d1;
 var d2;
@@ -187,7 +187,7 @@ var C = (function () {
         return x;
     };
     return C;
-})();
+}());
 var c = new C(b, d1);
 var r4 = c.foo(d1, d2); // Base
 var r5 = c.foo2(b, d2); // Derived
diff --git a/tests/baselines/reference/genericCallWithFixedArguments.js b/tests/baselines/reference/genericCallWithFixedArguments.js
index e588c0d113d66..a207d5c6d1716 100644
--- a/tests/baselines/reference/genericCallWithFixedArguments.js
+++ b/tests/baselines/reference/genericCallWithFixedArguments.js
@@ -13,12 +13,12 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.bar = function () { };
     return B;
-})();
+}());
 function g(x) { }
 g(7); // the parameter list is fixed, so this should not error
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js
index 06c49c64f5bde..c4290b73828f4 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js
@@ -28,12 +28,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var a;
 function foo4(cb) {
     var u;
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.js b/tests/baselines/reference/genericCallWithObjectTypeArgs.js
index b5429e9df4329..3496c28ecc3c1 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.js
@@ -26,17 +26,17 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 function foo(t, t2) {
     var x;
     return x;
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
index bded01ead69a1..509dd9a11360b 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
@@ -42,21 +42,21 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 // returns {}[]
 function f(a) {
     return [a.x, a.y];
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js
index ca8c11bd7b361..308051b720e04 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.js
@@ -40,17 +40,17 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 function foo(t, t2) {
     var x;
     return x;
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
index 96c2f9300db6b..d3f18e0bfcb24 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
@@ -50,14 +50,14 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 function f(x) {
     var r;
     return r;
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
index daaa2f5c0eb35..acab51690d343 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
@@ -48,21 +48,21 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 function f(a) {
     var r;
     return r;
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js
index 10d32ddeae742..2025c3eb6c06c 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints4.js
@@ -39,12 +39,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 function foo(t, t2) {
     return function (x) { return t2; };
 }
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js
index 95b98767a0960..355f639748bf8 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints5.js
@@ -30,12 +30,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 function foo(t, t2) {
     return function (x) { return t2; };
 }
diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
index 093757d513dc4..31b4cd181b97e 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
@@ -35,13 +35,13 @@ var M;
         function C1() {
         }
         return C1;
-    })();
+    }());
     M.C1 = C1;
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     var B = (function (_super) {
         __extends(B, _super);
@@ -49,7 +49,7 @@ var M;
             _super.apply(this, arguments);
         }
         return B;
-    })(C1);
+    }(C1));
     M.B = B;
     var D = (function () {
         function D() {
@@ -62,6 +62,6 @@ var M;
             v.subscribe(function (newValue) { });
         };
         return D;
-    })();
+    }());
     M.D = D;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/genericCallsWithoutParens.js b/tests/baselines/reference/genericCallsWithoutParens.js
index a479fbab375fa..b920016b58d1c 100644
--- a/tests/baselines/reference/genericCallsWithoutParens.js
+++ b/tests/baselines/reference/genericCallsWithoutParens.js
@@ -16,5 +16,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = new C(); // parse error
diff --git a/tests/baselines/reference/genericClassExpressionInFunction.js b/tests/baselines/reference/genericClassExpressionInFunction.js
index bb45587eea144..f334da5262567 100644
--- a/tests/baselines/reference/genericClassExpressionInFunction.js
+++ b/tests/baselines/reference/genericClassExpressionInFunction.js
@@ -41,7 +41,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 function B1() {
     // class expression can use T
     return (function (_super) {
@@ -50,7 +50,7 @@ function B1() {
             _super.apply(this, arguments);
         }
         return class_1;
-    })(A);
+    }(A));
 }
 var B2 = (function () {
     function B2() {
@@ -60,10 +60,10 @@ var B2 = (function () {
                 _super.apply(this, arguments);
             }
             return class_2;
-        })(A);
+        }(A));
     }
     return B2;
-})();
+}());
 function B3() {
     return (function (_super) {
         __extends(Inner, _super);
@@ -71,7 +71,7 @@ function B3() {
             _super.apply(this, arguments);
         }
         return Inner;
-    })(A);
+    }(A));
 }
 // extends can call B
 var K = (function (_super) {
@@ -80,14 +80,14 @@ var K = (function (_super) {
         _super.apply(this, arguments);
     }
     return K;
-})(B1());
+}(B1()));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})((new B2().anon));
+}((new B2().anon)));
 var b3Number = B3();
 var S = (function (_super) {
     __extends(S, _super);
@@ -95,7 +95,7 @@ var S = (function (_super) {
         _super.apply(this, arguments);
     }
     return S;
-})(b3Number);
+}(b3Number));
 var c = new C();
 var k = new K();
 var s = new S();
diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js
index 7d26be5fb2e2c..588cf93fe4b49 100644
--- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js
+++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js
@@ -14,7 +14,7 @@ var bar;
         function Foo() {
         }
         return Foo;
-    })();
+    }());
     bar.Foo = Foo;
 })(bar || (bar = {}));
 
diff --git a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
index f77f60a2fb931..9f71ace88a96c 100644
--- a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
+++ b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
@@ -17,16 +17,16 @@ var A = (function (_super) {
         _super.apply(this, arguments);
     }
     return A;
-})(B);
+}(B));
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(C);
+}(C));
 var C = (function () {
     function C(p) {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
index 6926174724433..8f90c2fb6e437 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
@@ -93,7 +93,7 @@ var Portal;
                 Validator.prototype.destroy = function () { };
                 Validator.prototype._validate = function (value) { return 0; };
                 return Validator;
-            })();
+            }());
             Validators.Validator = Validator;
         })(Validators = Controls.Validators || (Controls.Validators = {}));
     })(Controls = Portal.Controls || (Portal.Controls = {}));
@@ -112,7 +112,7 @@ var PortalFx;
                         _super.call(this, message);
                     }
                     return Validator;
-                })(Portal.Controls.Validators.Validator);
+                }(Portal.Controls.Validators.Validator));
                 Validators.Validator = Validator;
             })(Validators = Controls.Validators || (Controls.Validators = {}));
         })(Controls = ViewModels.Controls || (ViewModels.Controls = {}));
@@ -123,4 +123,4 @@ var ViewModel = (function () {
         this.validators = ko.observableArray();
     }
     return ViewModel;
-})();
+}());
diff --git a/tests/baselines/reference/genericClassStaticMethod.js b/tests/baselines/reference/genericClassStaticMethod.js
index aed721aa7d53a..394e6650e0a0e 100644
--- a/tests/baselines/reference/genericClassStaticMethod.js
+++ b/tests/baselines/reference/genericClassStaticMethod.js
@@ -22,7 +22,7 @@ var Foo = (function () {
     Foo.getFoo = function () {
     };
     return Foo;
-})();
+}());
 var Bar = (function (_super) {
     __extends(Bar, _super);
     function Bar() {
@@ -31,4 +31,4 @@ var Bar = (function (_super) {
     Bar.getFoo = function () {
     };
     return Bar;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js
index 5156c4d6b12a2..50510d88c248d 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.js
@@ -76,7 +76,7 @@ var ImmediatelyFix;
             return x(null);
         };
         return C;
-    })();
+    }());
     var c = new C();
     var r = c.foo(function (x) { return ''; }); // {}
     var r2 = c.foo(function (x) { return ''; }); // string 
@@ -88,7 +88,7 @@ var ImmediatelyFix;
             return x(null);
         };
         return C2;
-    })();
+    }());
     var c2 = new C2();
     var ra = c2.foo(function (x) { return 1; }); // number
     var r3a = c2.foo(function (x) { return 1; }); // number
@@ -102,7 +102,7 @@ var WithCandidates;
             return cb(x);
         };
         return C;
-    })();
+    }());
     var c;
     var r4 = c.foo2(1, function (a) { return ''; }); // string, contextual signature instantiation is applied to generic functions
     var r5 = c.foo2(1, function (a) { return ''; }); // string
@@ -114,7 +114,7 @@ var WithCandidates;
             return cb(x);
         };
         return C2;
-    })();
+    }());
     var c2;
     var r7 = c2.foo3(1, function (a) { return ''; }, ''); // string
     var r8 = c2.foo3(1, function (a) { return ''; }, ''); // string
@@ -125,7 +125,7 @@ var WithCandidates;
             return cb(x);
         };
         return C3;
-    })();
+    }());
     var c3;
     function other(t, u) {
         var r10 = c.foo2(1, function (x) { return ''; }); // error
diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js
index 5b0a4c111642d..467675c3497f8 100644
--- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js
+++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.js
@@ -67,17 +67,17 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 var Class;
 (function (Class) {
     var G = (function () {
@@ -88,7 +88,7 @@ var Class;
             return x;
         };
         return G;
-    })();
+    }());
     var c1 = new X();
     var d1 = new X();
     var g;
@@ -102,7 +102,7 @@ var Class;
             return x;
         };
         return G2;
-    })();
+    }());
     var g2;
     var r = g2.foo2(c1, d1);
     var r2 = g2.foo2(c1, c1);
diff --git a/tests/baselines/reference/genericClassWithStaticFactory.js b/tests/baselines/reference/genericClassWithStaticFactory.js
index 6fbef32dc1b61..ee65f23c2f1a5 100644
--- a/tests/baselines/reference/genericClassWithStaticFactory.js
+++ b/tests/baselines/reference/genericClassWithStaticFactory.js
@@ -230,7 +230,7 @@ var Editor;
             return this.insertEntryBefore(entry);
         };
         return List;
-    })();
+    }());
     Editor.List = List;
     var ListFactory = (function () {
         function ListFactory() {
@@ -262,6 +262,6 @@ var Editor;
             }
         };
         return ListFactory;
-    })();
+    }());
     Editor.ListFactory = ListFactory;
 })(Editor || (Editor = {}));
diff --git a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js
index 4caeacd19e24d..2039e459572ac 100644
--- a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js
+++ b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.js
@@ -30,4 +30,4 @@ var Foo = (function () {
     Foo.d = false || (function (x) { return x || undefined; })(null);
     Foo.e = function (x) { return null; };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/genericClasses0.js b/tests/baselines/reference/genericClasses0.js
index 158793a9cbf83..df6e691b9da6e 100644
--- a/tests/baselines/reference/genericClasses0.js
+++ b/tests/baselines/reference/genericClasses0.js
@@ -12,7 +12,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var v1;
 var y = v1.x; // should be 'string'
 
diff --git a/tests/baselines/reference/genericClasses1.js b/tests/baselines/reference/genericClasses1.js
index 804d6624a328f..de4ad6f917b29 100644
--- a/tests/baselines/reference/genericClasses1.js
+++ b/tests/baselines/reference/genericClasses1.js
@@ -12,7 +12,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var v1 = new C();
 var y = v1.x; // should be 'string'
 
diff --git a/tests/baselines/reference/genericClasses2.js b/tests/baselines/reference/genericClasses2.js
index b581621dc97d6..dcfed142d02f8 100644
--- a/tests/baselines/reference/genericClasses2.js
+++ b/tests/baselines/reference/genericClasses2.js
@@ -20,7 +20,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var v1;
 var y = v1.x; // should be 'string'
 var w = v1.y.a; // should be 'string'
diff --git a/tests/baselines/reference/genericClasses3.js b/tests/baselines/reference/genericClasses3.js
index 14ffab2f6f68b..2bd33efb3dcfb 100644
--- a/tests/baselines/reference/genericClasses3.js
+++ b/tests/baselines/reference/genericClasses3.js
@@ -27,14 +27,14 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(B);
+}(B));
 var v2;
 var y = v2.x; // should be 'string'
 var u = v2.a; // should be 'string'
diff --git a/tests/baselines/reference/genericClasses4.js b/tests/baselines/reference/genericClasses4.js
index 24927413d3e30..ab3620d2d79f2 100644
--- a/tests/baselines/reference/genericClasses4.js
+++ b/tests/baselines/reference/genericClasses4.js
@@ -37,4 +37,4 @@ var Vec2_T = (function () {
         return retval;
     };
     return Vec2_T;
-})();
+}());
diff --git a/tests/baselines/reference/genericClassesInModule.js b/tests/baselines/reference/genericClassesInModule.js
index 3f19b1f71f702..e531e25ec7af4 100644
--- a/tests/baselines/reference/genericClassesInModule.js
+++ b/tests/baselines/reference/genericClassesInModule.js
@@ -16,13 +16,13 @@ var Foo;
         function B() {
         }
         return B;
-    })();
+    }());
     Foo.B = B;
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     Foo.A = A;
 })(Foo || (Foo = {}));
 var a = new Foo.B();
diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js
index 1ec61d098646e..a17d9272c5b49 100644
--- a/tests/baselines/reference/genericClassesInModule2.js
+++ b/tests/baselines/reference/genericClassesInModule2.js
@@ -32,13 +32,13 @@ define(["require", "exports"], function (require, exports) {
             var child = new B(this);
         };
         return A;
-    })();
+    }());
     exports.A = A;
     var B = (function () {
         function B(parent) {
             this.parent = parent;
         }
         return B;
-    })();
+    }());
     exports.B = B;
 });
diff --git a/tests/baselines/reference/genericCloduleInModule.js b/tests/baselines/reference/genericCloduleInModule.js
index 92c519aa012a5..e3f926e1f9173 100644
--- a/tests/baselines/reference/genericCloduleInModule.js
+++ b/tests/baselines/reference/genericCloduleInModule.js
@@ -21,7 +21,7 @@ var A;
         B.prototype.foo = function () { };
         B.bar = function () { };
         return B;
-    })();
+    }());
     A.B = B;
     var B;
     (function (B) {
diff --git a/tests/baselines/reference/genericCloduleInModule2.js b/tests/baselines/reference/genericCloduleInModule2.js
index bb8021ffe8c80..433a165db9263 100644
--- a/tests/baselines/reference/genericCloduleInModule2.js
+++ b/tests/baselines/reference/genericCloduleInModule2.js
@@ -24,7 +24,7 @@ var A;
         B.prototype.foo = function () { };
         B.bar = function () { };
         return B;
-    })();
+    }());
     A.B = B;
 })(A || (A = {}));
 var A;
diff --git a/tests/baselines/reference/genericCloneReturnTypes.js b/tests/baselines/reference/genericCloneReturnTypes.js
index d7a279fb0bc2d..6d301c008e6f9 100644
--- a/tests/baselines/reference/genericCloneReturnTypes.js
+++ b/tests/baselines/reference/genericCloneReturnTypes.js
@@ -34,7 +34,7 @@ var Bar = (function () {
         return new Bar(this.size);
     };
     return Bar;
-})();
+}());
 var b;
 var b2 = b.clone();
 var b3;
diff --git a/tests/baselines/reference/genericCloneReturnTypes2.js b/tests/baselines/reference/genericCloneReturnTypes2.js
index 9a1201af7f8e1..1e908c4c865fd 100644
--- a/tests/baselines/reference/genericCloneReturnTypes2.js
+++ b/tests/baselines/reference/genericCloneReturnTypes2.js
@@ -25,7 +25,7 @@ var MyList = (function () {
         return new MyList(this.size);
     };
     return MyList;
-})();
+}());
 var a;
 var b = a.clone(); // ok
 var c = a.clone(); // bug was there was an error on this line
diff --git a/tests/baselines/reference/genericConstraint1.js b/tests/baselines/reference/genericConstraint1.js
index 38de98b121a29..52ce01433575c 100644
--- a/tests/baselines/reference/genericConstraint1.js
+++ b/tests/baselines/reference/genericConstraint1.js
@@ -16,6 +16,6 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
 var x = new C();
 x.bar2(2, "");
diff --git a/tests/baselines/reference/genericConstraint2.js b/tests/baselines/reference/genericConstraint2.js
index 9548ae485b4fe..9056ec847d70f 100644
--- a/tests/baselines/reference/genericConstraint2.js
+++ b/tests/baselines/reference/genericConstraint2.js
@@ -37,7 +37,7 @@ var ComparableString = (function () {
         return 0;
     };
     return ComparableString;
-})();
+}());
 var a = new ComparableString("a");
 var b = new ComparableString("b");
 var c = compare(a, b);
diff --git a/tests/baselines/reference/genericConstraintDeclaration.js b/tests/baselines/reference/genericConstraintDeclaration.js
index 6e3f8d5ff8b3b..eafda32f122e7 100644
--- a/tests/baselines/reference/genericConstraintDeclaration.js
+++ b/tests/baselines/reference/genericConstraintDeclaration.js
@@ -14,7 +14,7 @@ var List = (function () {
     }
     List.empty = function () { return null; };
     return List;
-})();
+}());
 
 
 //// [genericConstraintDeclaration.d.ts]
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
index b4e5693377573..d2bf12667fc9e 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
@@ -41,7 +41,7 @@ var EndGate;
                 this._from = from.Clone();
             }
             return Tween;
-        })();
+        }());
         Tweening.Tween = Tween;
     })(Tweening = EndGate.Tweening || (EndGate.Tweening = {}));
 })(EndGate || (EndGate = {}));
@@ -55,7 +55,7 @@ var EndGate;
                 _super.call(this, from);
             }
             return NumberTween;
-        })(Tweening.Tween);
+        }(Tweening.Tween));
         Tweening.NumberTween = NumberTween;
     })(Tweening = EndGate.Tweening || (EndGate.Tweening = {}));
 })(EndGate || (EndGate = {}));
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
index 54a807a8e878c..f61f57cb6157f 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
@@ -40,7 +40,7 @@ var EndGate;
                 this._from = from.Clone();
             }
             return Tween;
-        })();
+        }());
         Tweening.Tween = Tween;
     })(Tweening = EndGate.Tweening || (EndGate.Tweening = {}));
 })(EndGate || (EndGate = {}));
@@ -54,7 +54,7 @@ var EndGate;
                 _super.call(this, from);
             }
             return NumberTween;
-        })(Tweening.Tween);
+        }(Tweening.Tween));
         Tweening.NumberTween = NumberTween;
     })(Tweening = EndGate.Tweening || (EndGate.Tweening = {}));
 })(EndGate || (EndGate = {}));
diff --git a/tests/baselines/reference/genericConstructExpressionWithoutArgs.js b/tests/baselines/reference/genericConstructExpressionWithoutArgs.js
index c3066de2721b9..5eb21728eb163 100644
--- a/tests/baselines/reference/genericConstructExpressionWithoutArgs.js
+++ b/tests/baselines/reference/genericConstructExpressionWithoutArgs.js
@@ -15,12 +15,12 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var b = new B; // no error
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = new C; // C<any>
 var c2 = new C(); // error, type params are actually part of the arg list so you need both
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
index eb27365ebc570..906145850f15a 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
@@ -22,14 +22,14 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var x;
 var y;
 x = y; // error
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
index be94a77885898..1c73075acc4f4 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
@@ -22,14 +22,14 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var x;
 var y;
 x = y; // error
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js
index 9ad885a899aff..7caa65b971b8b 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.js
@@ -21,7 +21,7 @@ var Collection = (function () {
     }
     Collection.prototype.add = function (x) { };
     return Collection;
-})();
+}());
 var utils;
 var c = new Collection();
 var r3 = utils.mapReduce(c, function (x) { return 1; }, function (y) { return new Date(); });
diff --git a/tests/baselines/reference/genericGetter.js b/tests/baselines/reference/genericGetter.js
index 59425d8c13b51..81e2531f1b9df 100644
--- a/tests/baselines/reference/genericGetter.js
+++ b/tests/baselines/reference/genericGetter.js
@@ -21,6 +21,6 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var c = new C();
 var r = c.x;
diff --git a/tests/baselines/reference/genericGetter2.js b/tests/baselines/reference/genericGetter2.js
index 9d39ce02d5f47..022233b78e04d 100644
--- a/tests/baselines/reference/genericGetter2.js
+++ b/tests/baselines/reference/genericGetter2.js
@@ -13,7 +13,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -25,4 +25,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/genericGetter3.js b/tests/baselines/reference/genericGetter3.js
index 1cb01c6f112c6..93465009378fd 100644
--- a/tests/baselines/reference/genericGetter3.js
+++ b/tests/baselines/reference/genericGetter3.js
@@ -16,7 +16,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -28,6 +28,6 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var c = new C();
 var r = c.x;
diff --git a/tests/baselines/reference/genericImplements.js b/tests/baselines/reference/genericImplements.js
index b8d295153a40d..1a67fb29ad817 100644
--- a/tests/baselines/reference/genericImplements.js
+++ b/tests/baselines/reference/genericImplements.js
@@ -25,13 +25,13 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 ;
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 ;
 // OK
 var X = (function () {
@@ -39,18 +39,18 @@ var X = (function () {
     }
     X.prototype.f = function () { return undefined; };
     return X;
-})(); // { f: () => { b; } }
+}()); // { f: () => { b; } }
 // OK
 var Y = (function () {
     function Y() {
     }
     Y.prototype.f = function () { return undefined; };
     return Y;
-})(); // { f: () => { a; } }
+}()); // { f: () => { a; } }
 // OK
 var Z = (function () {
     function Z() {
     }
     Z.prototype.f = function () { return undefined; };
     return Z;
-})(); // { f: <T>() => T } 
+}()); // { f: <T>() => T } 
diff --git a/tests/baselines/reference/genericInstanceOf.js b/tests/baselines/reference/genericInstanceOf.js
index 9017cfe050a88..6d060a75fe196 100644
--- a/tests/baselines/reference/genericInstanceOf.js
+++ b/tests/baselines/reference/genericInstanceOf.js
@@ -22,4 +22,4 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/genericInterfaceImplementation.js b/tests/baselines/reference/genericInterfaceImplementation.js
index 8dc442b495975..c68c3e0d22234 100644
--- a/tests/baselines/reference/genericInterfaceImplementation.js
+++ b/tests/baselines/reference/genericInterfaceImplementation.js
@@ -27,4 +27,4 @@ var None = (function () {
         return new None();
     };
     return None;
-})();
+}());
diff --git a/tests/baselines/reference/genericInterfacesWithoutTypeArguments.js b/tests/baselines/reference/genericInterfacesWithoutTypeArguments.js
index 4db7f2d0b1dbb..e6a2fd65a66e5 100644
--- a/tests/baselines/reference/genericInterfacesWithoutTypeArguments.js
+++ b/tests/baselines/reference/genericInterfacesWithoutTypeArguments.js
@@ -10,6 +10,6 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var i;
 var c;
diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js
index b442b2f8757ba..c15868e20c470 100644
--- a/tests/baselines/reference/genericMemberFunction.js
+++ b/tests/baselines/reference/genericMemberFunction.js
@@ -32,7 +32,7 @@ define(["require", "exports"], function (require, exports) {
             return undefined;
         };
         return BuildError;
-    })();
+    }());
     exports.BuildError = BuildError;
     var FileWithErrors = (function () {
         function FileWithErrors() {
@@ -44,7 +44,7 @@ define(["require", "exports"], function (require, exports) {
             return undefined;
         };
         return FileWithErrors;
-    })();
+    }());
     exports.FileWithErrors = FileWithErrors;
     var BuildResult = (function () {
         function BuildResult() {
@@ -57,6 +57,6 @@ define(["require", "exports"], function (require, exports) {
             });
         };
         return BuildResult;
-    })();
+    }());
     exports.BuildResult = BuildResult;
 });
diff --git a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js
index 27961a68c739a..ac51424deea5f 100644
--- a/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js
+++ b/tests/baselines/reference/genericMergedDeclarationUsingTypeParameter2.js
@@ -11,7 +11,7 @@ var foo = (function () {
     function foo(x) {
     }
     return foo;
-})();
+}());
 var foo;
 (function (foo) {
     var y = 1;
diff --git a/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.js b/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.js
index 75e85283aa9dd..bbd621ca09fbf 100644
--- a/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.js
+++ b/tests/baselines/reference/genericObjectCreationWithoutTypeArgs.js
@@ -14,7 +14,7 @@ var SS = (function () {
     function SS() {
     }
     return SS;
-})();
+}());
 var x1 = new SS(); // OK
 var x2 = new SS(); // Correctly give error 
 var x3 = new SS(); // OK
diff --git a/tests/baselines/reference/genericObjectLitReturnType.js b/tests/baselines/reference/genericObjectLitReturnType.js
index 826f5233b5580..e9b1ba2f60dae 100644
--- a/tests/baselines/reference/genericObjectLitReturnType.js
+++ b/tests/baselines/reference/genericObjectLitReturnType.js
@@ -17,7 +17,7 @@ var X = (function () {
     }
     X.prototype.f = function (t) { return { a: t }; };
     return X;
-})();
+}());
 var x;
 var t1 = x.f(5);
 t1.a = 5; // Should not error: t1 should have type {a: number}, instead has type {a: T}
diff --git a/tests/baselines/reference/genericOfACloduleType1.js b/tests/baselines/reference/genericOfACloduleType1.js
index 1f115aa486a83..3e4b9d3a9d418 100644
--- a/tests/baselines/reference/genericOfACloduleType1.js
+++ b/tests/baselines/reference/genericOfACloduleType1.js
@@ -18,7 +18,7 @@ var G = (function () {
     }
     G.prototype.bar = function (x) { return x; };
     return G;
-})();
+}());
 var M;
 (function (M) {
     var C = (function () {
@@ -26,7 +26,7 @@ var M;
         }
         C.prototype.foo = function () { };
         return C;
-    })();
+    }());
     M.C = C;
     var C;
     (function (C) {
@@ -34,7 +34,7 @@ var M;
             function X() {
             }
             return X;
-        })();
+        }());
         C.X = X;
     })(C = M.C || (M.C = {}));
     var g1 = new G();
diff --git a/tests/baselines/reference/genericOfACloduleType2.js b/tests/baselines/reference/genericOfACloduleType2.js
index 1d671289cb2f5..f1e3f2a8a0001 100644
--- a/tests/baselines/reference/genericOfACloduleType2.js
+++ b/tests/baselines/reference/genericOfACloduleType2.js
@@ -21,7 +21,7 @@ var G = (function () {
     }
     G.prototype.bar = function (x) { return x; };
     return G;
-})();
+}());
 var M;
 (function (M) {
     var C = (function () {
@@ -29,7 +29,7 @@ var M;
         }
         C.prototype.foo = function () { };
         return C;
-    })();
+    }());
     M.C = C;
     var C;
     (function (C) {
@@ -37,7 +37,7 @@ var M;
             function X() {
             }
             return X;
-        })();
+        }());
         C.X = X;
     })(C = M.C || (M.C = {}));
     var g1 = new G();
diff --git a/tests/baselines/reference/genericOverloadSignatures.js b/tests/baselines/reference/genericOverloadSignatures.js
index 45a21d5a3349f..829ee557e4e29 100644
--- a/tests/baselines/reference/genericOverloadSignatures.js
+++ b/tests/baselines/reference/genericOverloadSignatures.js
@@ -36,5 +36,5 @@ var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var b;
diff --git a/tests/baselines/reference/genericPrototypeProperty.js b/tests/baselines/reference/genericPrototypeProperty.js
index fb6f9b7884836..77102b280a19a 100644
--- a/tests/baselines/reference/genericPrototypeProperty.js
+++ b/tests/baselines/reference/genericPrototypeProperty.js
@@ -15,7 +15,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { return null; };
     return C;
-})();
+}());
 var r = C.prototype;
 // should be any
 var r2 = r.x;
diff --git a/tests/baselines/reference/genericPrototypeProperty2.js b/tests/baselines/reference/genericPrototypeProperty2.js
index cbe33431ca46f..3f1b6e21adc86 100644
--- a/tests/baselines/reference/genericPrototypeProperty2.js
+++ b/tests/baselines/reference/genericPrototypeProperty2.js
@@ -25,23 +25,23 @@ var BaseEvent = (function () {
     function BaseEvent() {
     }
     return BaseEvent;
-})();
+}());
 var MyEvent = (function (_super) {
     __extends(MyEvent, _super);
     function MyEvent() {
         _super.apply(this, arguments);
     }
     return MyEvent;
-})(BaseEvent);
+}(BaseEvent));
 var BaseEventWrapper = (function () {
     function BaseEventWrapper() {
     }
     return BaseEventWrapper;
-})();
+}());
 var MyEventWrapper = (function (_super) {
     __extends(MyEventWrapper, _super);
     function MyEventWrapper() {
         _super.apply(this, arguments);
     }
     return MyEventWrapper;
-})(BaseEventWrapper);
+}(BaseEventWrapper));
diff --git a/tests/baselines/reference/genericPrototypeProperty3.js b/tests/baselines/reference/genericPrototypeProperty3.js
index 6447a4e0ac229..b7cca85561c63 100644
--- a/tests/baselines/reference/genericPrototypeProperty3.js
+++ b/tests/baselines/reference/genericPrototypeProperty3.js
@@ -24,23 +24,23 @@ var BaseEvent = (function () {
     function BaseEvent() {
     }
     return BaseEvent;
-})();
+}());
 var MyEvent = (function (_super) {
     __extends(MyEvent, _super);
     function MyEvent() {
         _super.apply(this, arguments);
     }
     return MyEvent;
-})(BaseEvent);
+}(BaseEvent));
 var BaseEventWrapper = (function () {
     function BaseEventWrapper() {
     }
     return BaseEventWrapper;
-})();
+}());
 var MyEventWrapper = (function (_super) {
     __extends(MyEventWrapper, _super);
     function MyEventWrapper() {
         _super.apply(this, arguments);
     }
     return MyEventWrapper;
-})(BaseEventWrapper);
+}(BaseEventWrapper));
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
index a1f7566f1c08e..73012f714e8af 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
@@ -52,7 +52,7 @@ var TypeScript2;
             return undefined;
         };
         return PullSymbol;
-    })();
+    }());
     TypeScript2.PullSymbol = PullSymbol;
     var PullTypeSymbol = (function (_super) {
         __extends(PullTypeSymbol, _super);
@@ -60,6 +60,6 @@ var TypeScript2;
             _super.apply(this, arguments);
         }
         return PullTypeSymbol;
-    })(PullSymbol);
+    }(PullSymbol));
     TypeScript2.PullTypeSymbol = PullTypeSymbol;
 })(TypeScript2 || (TypeScript2 = {}));
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
index a0229e19925db..61cb758c48e76 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
@@ -44,7 +44,7 @@ var TypeScript;
         MemberName.create = function (arg1, arg2, arg3) {
         };
         return MemberName;
-    })();
+    }());
     TypeScript.MemberName = MemberName;
 })(TypeScript || (TypeScript = {}));
 var TypeScript;
@@ -54,7 +54,7 @@ var TypeScript;
             this.type = null;
         }
         return PullSymbol;
-    })();
+    }());
     TypeScript.PullSymbol = PullSymbol;
     var PullTypeSymbol = (function (_super) {
         __extends(PullTypeSymbol, _super);
@@ -76,6 +76,6 @@ var TypeScript;
             }
         };
         return PullTypeSymbol;
-    })(PullSymbol);
+    }(PullSymbol));
     TypeScript.PullTypeSymbol = PullTypeSymbol;
 })(TypeScript || (TypeScript = {}));
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js
index 76b60435f5571..56367ca9c5e89 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.js
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js
@@ -21,6 +21,6 @@ define(["require", "exports"], function (require, exports) {
             configurable: true
         });
         return DbSet;
-    })();
+    }());
     exports.DbSet = DbSet;
 });
diff --git a/tests/baselines/reference/genericReversingTypeParameters.js b/tests/baselines/reference/genericReversingTypeParameters.js
index 2a52c2e9ba627..33f598a1642db 100644
--- a/tests/baselines/reference/genericReversingTypeParameters.js
+++ b/tests/baselines/reference/genericReversingTypeParameters.js
@@ -17,7 +17,7 @@ var BiMap = (function () {
     BiMap.prototype.get = function (key) { return null; };
     BiMap.prototype.inverse = function () { return null; };
     return BiMap;
-})();
+}());
 var b = new BiMap();
 var r1 = b.get('');
 var i = b.inverse(); // used to get the type wrong here.
diff --git a/tests/baselines/reference/genericReversingTypeParameters2.js b/tests/baselines/reference/genericReversingTypeParameters2.js
index 4f4bc564f89ab..40102d790d91b 100644
--- a/tests/baselines/reference/genericReversingTypeParameters2.js
+++ b/tests/baselines/reference/genericReversingTypeParameters2.js
@@ -16,7 +16,7 @@ var BiMap = (function () {
     BiMap.prototype.get = function (key) { return null; };
     BiMap.prototype.inverse = function () { return null; };
     return BiMap;
-})();
+}());
 var b = new BiMap();
 var i = b.inverse(); // used to get the type wrong here.
 var r2b = i.get(1);
diff --git a/tests/baselines/reference/genericSpecializations1.js b/tests/baselines/reference/genericSpecializations1.js
index 3e59fceff975e..2aabf708a6f19 100644
--- a/tests/baselines/reference/genericSpecializations1.js
+++ b/tests/baselines/reference/genericSpecializations1.js
@@ -21,16 +21,16 @@ var IntFooBad = (function () {
     }
     IntFooBad.prototype.foo = function (x) { return null; };
     return IntFooBad;
-})();
+}());
 var StringFoo2 = (function () {
     function StringFoo2() {
     }
     StringFoo2.prototype.foo = function (x) { return null; };
     return StringFoo2;
-})();
+}());
 var StringFoo3 = (function () {
     function StringFoo3() {
     }
     StringFoo3.prototype.foo = function (x) { return null; };
     return StringFoo3;
-})();
+}());
diff --git a/tests/baselines/reference/genericSpecializations2.js b/tests/baselines/reference/genericSpecializations2.js
index 8497d2db8b484..6975575ec5ecc 100644
--- a/tests/baselines/reference/genericSpecializations2.js
+++ b/tests/baselines/reference/genericSpecializations2.js
@@ -27,22 +27,22 @@ var IFoo = (function () {
         return null;
     };
     return IFoo;
-})();
+}());
 var IntFooBad = (function () {
     function IntFooBad() {
     }
     IntFooBad.prototype.foo = function (x) { return null; };
     return IntFooBad;
-})();
+}());
 var StringFoo2 = (function () {
     function StringFoo2() {
     }
     StringFoo2.prototype.foo = function (x) { return null; };
     return StringFoo2;
-})();
+}());
 var StringFoo3 = (function () {
     function StringFoo3() {
     }
     StringFoo3.prototype.foo = function (x) { return null; };
     return StringFoo3;
-})();
+}());
diff --git a/tests/baselines/reference/genericSpecializations3.js b/tests/baselines/reference/genericSpecializations3.js
index 3c582ae31fd12..03d07b6dff990 100644
--- a/tests/baselines/reference/genericSpecializations3.js
+++ b/tests/baselines/reference/genericSpecializations3.js
@@ -43,21 +43,21 @@ var IntFooBad = (function () {
     }
     IntFooBad.prototype.foo = function (x) { return null; };
     return IntFooBad;
-})();
+}());
 var intFooBad;
 var IntFoo = (function () {
     function IntFoo() {
     }
     IntFoo.prototype.foo = function (x) { return null; };
     return IntFoo;
-})();
+}());
 var intFoo;
 var StringFoo2 = (function () {
     function StringFoo2() {
     }
     StringFoo2.prototype.foo = function (x) { return null; };
     return StringFoo2;
-})();
+}());
 var stringFoo2;
 stringFoo2.foo("hm");
 intFoo = stringFoo2; // error
@@ -67,5 +67,5 @@ var StringFoo3 = (function () {
     }
     StringFoo3.prototype.foo = function (x) { return null; };
     return StringFoo3;
-})();
+}());
 var stringFoo3;
diff --git a/tests/baselines/reference/genericStaticAnyTypeFunction.js b/tests/baselines/reference/genericStaticAnyTypeFunction.js
index 6816afec91019..7ed9494d3cf4c 100644
--- a/tests/baselines/reference/genericStaticAnyTypeFunction.js
+++ b/tests/baselines/reference/genericStaticAnyTypeFunction.js
@@ -30,4 +30,4 @@ var A = (function () {
         return this.one(source, 42); // should not error
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/genericTypeAssertions1.js b/tests/baselines/reference/genericTypeAssertions1.js
index 54637007d9928..904e696af489e 100644
--- a/tests/baselines/reference/genericTypeAssertions1.js
+++ b/tests/baselines/reference/genericTypeAssertions1.js
@@ -10,7 +10,7 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { };
     return A;
-})();
+}());
 var foo = new A();
 var r = new A(); // error
 var r2 = foo; // error
diff --git a/tests/baselines/reference/genericTypeAssertions2.js b/tests/baselines/reference/genericTypeAssertions2.js
index 22ff708592e6b..02a51aed35de1 100644
--- a/tests/baselines/reference/genericTypeAssertions2.js
+++ b/tests/baselines/reference/genericTypeAssertions2.js
@@ -24,7 +24,7 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -34,7 +34,7 @@ var B = (function (_super) {
         return null;
     };
     return B;
-})(A);
+}(A));
 var foo = new A();
 var r = new B();
 var r2 = new B(); // error
diff --git a/tests/baselines/reference/genericTypeAssertions4.js b/tests/baselines/reference/genericTypeAssertions4.js
index d6d8672283cd9..2c5bbf51d7f89 100644
--- a/tests/baselines/reference/genericTypeAssertions4.js
+++ b/tests/baselines/reference/genericTypeAssertions4.js
@@ -36,7 +36,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { return ""; };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -44,7 +44,7 @@ var B = (function (_super) {
     }
     B.prototype.bar = function () { return 1; };
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -52,7 +52,7 @@ var C = (function (_super) {
     }
     C.prototype.baz = function () { return 1; };
     return C;
-})(A);
+}(A));
 var a;
 var b;
 var c;
diff --git a/tests/baselines/reference/genericTypeAssertions6.js b/tests/baselines/reference/genericTypeAssertions6.js
index 30a5d5ff5e559..5bc7a943163d4 100644
--- a/tests/baselines/reference/genericTypeAssertions6.js
+++ b/tests/baselines/reference/genericTypeAssertions6.js
@@ -40,7 +40,7 @@ var A = (function () {
         y = x;
     };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -54,6 +54,6 @@ var B = (function (_super) {
         var e = new Date();
     };
     return B;
-})(A);
+}(A));
 var b;
 var c = b;
diff --git a/tests/baselines/reference/genericTypeConstraints.js b/tests/baselines/reference/genericTypeConstraints.js
index eb8bed1fb9231..5f4bb41a83fc9 100644
--- a/tests/baselines/reference/genericTypeConstraints.js
+++ b/tests/baselines/reference/genericTypeConstraints.js
@@ -24,21 +24,21 @@ var Foo = (function () {
     }
     Foo.prototype.fooMethod = function () { };
     return Foo;
-})();
+}());
 var FooExtended = (function () {
     function FooExtended() {
     }
     return FooExtended;
-})();
+}());
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var BarExtended = (function (_super) {
     __extends(BarExtended, _super);
     function BarExtended() {
         _super.call(this);
     }
     return BarExtended;
-})(Bar);
+}(Bar));
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
index 0cbf35817064b..7fe6c49d65efd 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
@@ -49,7 +49,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var a;
 var b;
@@ -63,14 +63,14 @@ var D = (function (_super) {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 var M;
 (function (M) {
     var E = (function () {
         function E() {
         }
         return E;
-    })();
+    }());
     M.E = E;
 })(M || (M = {}));
 var D2 = (function (_super) {
@@ -79,12 +79,12 @@ var D2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D2;
-})(M.E);
+}(M.E));
 var D3 = (function () {
     function D3() {
     }
     return D3;
-})();
+}());
 function h(x) { }
 function i(x) { }
 var j = null;
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
index 355030caa1b5f..12be456a8a829 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
@@ -58,14 +58,14 @@ var D = (function (_super) {
         _super.apply(this, arguments);
     }
     return D;
-})(I);
+}(I));
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
         _super.apply(this, arguments);
     }
     return D2;
-})(M.C);
+}(M.C));
 function h(x) { }
 function i(x) { }
 var j = null;
diff --git a/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js b/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js
index 90ad9e1ff93ca..8e8060194b028 100644
--- a/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js
+++ b/tests/baselines/reference/genericTypeReferencesRequireTypeArgs.js
@@ -17,7 +17,7 @@ var C = (function () {
     }
     C.prototype.foo = function () { return null; };
     return C;
-})();
+}());
 var c1; // error
 var i1; // error
 var c2; // should be an error
diff --git a/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.js b/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.js
index d651c5bea61c8..765d9733727b7 100644
--- a/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.js
+++ b/tests/baselines/reference/genericTypeUsedWithoutTypeArguments1.js
@@ -8,4 +8,4 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers.js b/tests/baselines/reference/genericTypeWithCallableMembers.js
index ebf95b41dcc88..c1a28b384bb9e 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers.js
+++ b/tests/baselines/reference/genericTypeWithCallableMembers.js
@@ -23,4 +23,4 @@ var C = (function () {
         var x2 = new this.data2(); // was error, shouldn't be
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js b/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js
index 1a57b866d99e8..3c3577b853ea9 100644
--- a/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js
+++ b/tests/baselines/reference/genericTypeWithNonGenericBaseMisMatch.js
@@ -15,6 +15,6 @@ var X = (function () {
     }
     X.prototype.f = function (a) { };
     return X;
-})();
+}());
 var x = new X();
 var i = x; // Should not be allowed -- type of 'f' is incompatible with 'I'
diff --git a/tests/baselines/reference/genericWithCallSignatures1.js b/tests/baselines/reference/genericWithCallSignatures1.js
index 0d512faa7e110..95145470ac3a1 100644
--- a/tests/baselines/reference/genericWithCallSignatures1.js
+++ b/tests/baselines/reference/genericWithCallSignatures1.js
@@ -28,4 +28,4 @@ var MyClass = (function () {
         var x = this.callableThing();
     };
     return MyClass;
-})();
+}());
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js
index 441123c9fd457..b7c0ca2a0db60 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js
@@ -17,6 +17,6 @@ var LazyArray = (function () {
         return this.objects;
     };
     return LazyArray;
-})();
+}());
 var lazyArray = new LazyArray();
 var value = lazyArray.array()["test"]; // used to be an error
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
index 1a536132d15c9..1f016b401ede4 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -26,7 +26,7 @@ define(["require", "exports"], function (require, exports) {
         function Collection() {
         }
         return Collection;
-    })();
+    }());
     exports.Collection = Collection;
     var List = (function (_super) {
         __extends(List, _super);
@@ -35,13 +35,13 @@ define(["require", "exports"], function (require, exports) {
         }
         List.prototype.Bar = function () { };
         return List;
-    })(Collection);
+    }(Collection));
     exports.List = List;
     var CollectionItem = (function () {
         function CollectionItem() {
         }
         return CollectionItem;
-    })();
+    }());
     exports.CollectionItem = CollectionItem;
     var ListItem = (function (_super) {
         __extends(ListItem, _super);
@@ -49,6 +49,6 @@ define(["require", "exports"], function (require, exports) {
             _super.apply(this, arguments);
         }
         return ListItem;
-    })(CollectionItem);
+    }(CollectionItem));
     exports.ListItem = ListItem;
 });
diff --git a/tests/baselines/reference/genericWithOpenTypeParameters1.js b/tests/baselines/reference/genericWithOpenTypeParameters1.js
index 9020276701217..90ea23e43ef2e 100644
--- a/tests/baselines/reference/genericWithOpenTypeParameters1.js
+++ b/tests/baselines/reference/genericWithOpenTypeParameters1.js
@@ -17,7 +17,7 @@ var B = (function () {
     }
     B.prototype.foo = function (x) { return null; };
     return B;
-})();
+}());
 var x;
 x.foo(1); // no error
 var f = function (x) { return x.foo(1); }; // error
diff --git a/tests/baselines/reference/generics3.js b/tests/baselines/reference/generics3.js
index d88ed1082cd73..8c68384dd68a5 100644
--- a/tests/baselines/reference/generics3.js
+++ b/tests/baselines/reference/generics3.js
@@ -12,7 +12,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b;
 a = b; // Ok - should be identical
diff --git a/tests/baselines/reference/generics4.js b/tests/baselines/reference/generics4.js
index 95d8aea4f5511..42b64224eb2e8 100644
--- a/tests/baselines/reference/generics4.js
+++ b/tests/baselines/reference/generics4.js
@@ -12,7 +12,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b;
 a = b; // Not ok - return types of "f" are different
diff --git a/tests/baselines/reference/generics4NoError.js b/tests/baselines/reference/generics4NoError.js
index 0076dc81fb60f..b247a24b633dd 100644
--- a/tests/baselines/reference/generics4NoError.js
+++ b/tests/baselines/reference/generics4NoError.js
@@ -11,7 +11,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b;
 
diff --git a/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js b/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js
index 72eeb1ab683e2..43e933cd0fc72 100644
--- a/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js
+++ b/tests/baselines/reference/genericsWithDuplicateTypeParameters1.js
@@ -25,7 +25,7 @@ var C = (function () {
     C.prototype.f = function () { };
     C.prototype.f2 = function (a, b) { return null; };
     return C;
-})();
+}());
 var m = {
     a: function f() { },
     b: function f2(a, b) { return null; }
diff --git a/tests/baselines/reference/genericsWithoutTypeParameters1.js b/tests/baselines/reference/genericsWithoutTypeParameters1.js
index 41abffcb854f7..443dd72da2334 100644
--- a/tests/baselines/reference/genericsWithoutTypeParameters1.js
+++ b/tests/baselines/reference/genericsWithoutTypeParameters1.js
@@ -39,7 +39,7 @@ var C = (function () {
     }
     C.prototype.foo = function () { return null; };
     return C;
-})();
+}());
 var c1;
 var i1;
 var c2;
@@ -52,12 +52,12 @@ var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 function f(x) {
     return null;
 }
diff --git a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js
index 0211ce55119be..8b41cafa5b17a 100644
--- a/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js
+++ b/tests/baselines/reference/getAccessorWithImpliedReturnTypeAndFunctionClassMerge.js
@@ -42,6 +42,6 @@ var MyModule;
             configurable: true
         });
         return MyClass;
-    })();
+    }());
     MyModule.MyClass = MyClass;
 })(MyModule || (MyModule = {}));
diff --git a/tests/baselines/reference/getAndSetAsMemberNames.js b/tests/baselines/reference/getAndSetAsMemberNames.js
index 8b036cd0f73ec..0b0d8ff7e0131 100644
--- a/tests/baselines/reference/getAndSetAsMemberNames.js
+++ b/tests/baselines/reference/getAndSetAsMemberNames.js
@@ -27,12 +27,12 @@ var C1 = (function () {
         this.get = 1;
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
@@ -40,13 +40,13 @@ var C3 = (function () {
         return x + 1;
     };
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
         this.get = true;
     }
     return C4;
-})();
+}());
 var C5 = (function () {
     function C5() {
         this.set = function () { return true; };
@@ -58,4 +58,4 @@ var C5 = (function () {
         configurable: true
     });
     return C5;
-})();
+}());
diff --git a/tests/baselines/reference/getAndSetNotIdenticalType.js b/tests/baselines/reference/getAndSetNotIdenticalType.js
index e6eb7fecc863c..cf2cd75828b06 100644
--- a/tests/baselines/reference/getAndSetNotIdenticalType.js
+++ b/tests/baselines/reference/getAndSetNotIdenticalType.js
@@ -19,4 +19,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/getAndSetNotIdenticalType2.js b/tests/baselines/reference/getAndSetNotIdenticalType2.js
index d73f07ec3883a..82f4c55332960 100644
--- a/tests/baselines/reference/getAndSetNotIdenticalType2.js
+++ b/tests/baselines/reference/getAndSetNotIdenticalType2.js
@@ -20,7 +20,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -35,7 +35,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var x = new C();
 var r = x.x;
 x.x = r;
diff --git a/tests/baselines/reference/getAndSetNotIdenticalType3.js b/tests/baselines/reference/getAndSetNotIdenticalType3.js
index 2f37a7cbfae5c..2841c4d6d8a00 100644
--- a/tests/baselines/reference/getAndSetNotIdenticalType3.js
+++ b/tests/baselines/reference/getAndSetNotIdenticalType3.js
@@ -20,7 +20,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -35,7 +35,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var x = new C();
 var r = x.x;
 x.x = r;
diff --git a/tests/baselines/reference/getEmitOutput-pp.baseline b/tests/baselines/reference/getEmitOutput-pp.baseline
index d5487a14d95a3..d6952e4537d0b 100644
--- a/tests/baselines/reference/getEmitOutput-pp.baseline
+++ b/tests/baselines/reference/getEmitOutput-pp.baseline
@@ -5,7 +5,7 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 FileName : tests/cases/fourslash/shims-pp/inputFile1.d.ts
 declare var x: number;
 declare class Bar {
@@ -20,7 +20,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 FileName : tests/cases/fourslash/shims-pp/inputFile2.d.ts
 declare var x1: string;
 declare class Foo {
diff --git a/tests/baselines/reference/getEmitOutput.baseline b/tests/baselines/reference/getEmitOutput.baseline
index fbc3296c7c407..52c7d8a7aaeb9 100644
--- a/tests/baselines/reference/getEmitOutput.baseline
+++ b/tests/baselines/reference/getEmitOutput.baseline
@@ -5,7 +5,7 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 FileName : tests/cases/fourslash/shims/inputFile1.d.ts
 declare var x: number;
 declare class Bar {
@@ -20,7 +20,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 FileName : tests/cases/fourslash/shims/inputFile2.d.ts
 declare var x1: string;
 declare class Foo {
diff --git a/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline b/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline
index 5552851dec48c..5a6fb434b1f9f 100644
--- a/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline
+++ b/tests/baselines/reference/getEmitOutputDeclarationMultiFiles.baseline
@@ -5,7 +5,7 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 FileName : tests/cases/fourslash/inputFile1.d.ts
 declare var x: number;
 declare class Bar {
@@ -20,7 +20,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 FileName : tests/cases/fourslash/inputFile2.d.ts
 declare var x1: string;
 declare class Foo {
diff --git a/tests/baselines/reference/getEmitOutputDeclarationSingleFile.baseline b/tests/baselines/reference/getEmitOutputDeclarationSingleFile.baseline
index 4abc99b05c2f8..a756897fffb5e 100644
--- a/tests/baselines/reference/getEmitOutputDeclarationSingleFile.baseline
+++ b/tests/baselines/reference/getEmitOutputDeclarationSingleFile.baseline
@@ -5,13 +5,13 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var x1 = "hello world";
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 FileName : declSingleFile.d.ts
 declare var x: number;
 declare class Bar {
diff --git a/tests/baselines/reference/getEmitOutputExternalModule.baseline b/tests/baselines/reference/getEmitOutputExternalModule.baseline
index ac2f7cb3dacf9..1b18ace6ab61d 100644
--- a/tests/baselines/reference/getEmitOutputExternalModule.baseline
+++ b/tests/baselines/reference/getEmitOutputExternalModule.baseline
@@ -5,5 +5,5 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 
diff --git a/tests/baselines/reference/getEmitOutputExternalModule2.baseline b/tests/baselines/reference/getEmitOutputExternalModule2.baseline
index c32472d318f78..0b6c4a9b1ff30 100644
--- a/tests/baselines/reference/getEmitOutputExternalModule2.baseline
+++ b/tests/baselines/reference/getEmitOutputExternalModule2.baseline
@@ -5,11 +5,11 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var x = "world";
 var Bar2 = (function () {
     function Bar2() {
     }
     return Bar2;
-})();
+}());
 
diff --git a/tests/baselines/reference/getEmitOutputMapRoots.baseline b/tests/baselines/reference/getEmitOutputMapRoots.baseline
index 2c814ddb9b479..3b8792e3777aa 100644
--- a/tests/baselines/reference/getEmitOutputMapRoots.baseline
+++ b/tests/baselines/reference/getEmitOutputMapRoots.baseline
@@ -7,5 +7,5 @@ var M = (function () {
     function M() {
     }
     return M;
-})();
+}());
 //# sourceMappingURL=tests/cases/fourslash/mapRootDir/declSingleFile.js.map
diff --git a/tests/baselines/reference/getEmitOutputNoErrors.baseline b/tests/baselines/reference/getEmitOutputNoErrors.baseline
index a1efeecd32191..461cba4ea055d 100644
--- a/tests/baselines/reference/getEmitOutputNoErrors.baseline
+++ b/tests/baselines/reference/getEmitOutputNoErrors.baseline
@@ -5,5 +5,5 @@ var M = (function () {
     function M() {
     }
     return M;
-})();
+}());
 
diff --git a/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline b/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline
index 981b4710e41b1..4d1c88e45b4f4 100644
--- a/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline
+++ b/tests/baselines/reference/getEmitOutputOnlyOneFile.baseline
@@ -5,5 +5,5 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 
diff --git a/tests/baselines/reference/getEmitOutputOutFile.baseline b/tests/baselines/reference/getEmitOutputOutFile.baseline
index 702097a7c0364..0b5e93271e4d8 100644
--- a/tests/baselines/reference/getEmitOutputOutFile.baseline
+++ b/tests/baselines/reference/getEmitOutputOutFile.baseline
@@ -5,13 +5,13 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var x1 = "hello world";
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 FileName : outFile.d.ts
 declare var x: number;
 declare class Bar {
diff --git a/tests/baselines/reference/getEmitOutputSingleFile.baseline b/tests/baselines/reference/getEmitOutputSingleFile.baseline
index 4a71299dcc08a..922f3ab879024 100644
--- a/tests/baselines/reference/getEmitOutputSingleFile.baseline
+++ b/tests/baselines/reference/getEmitOutputSingleFile.baseline
@@ -5,11 +5,11 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var x;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 
diff --git a/tests/baselines/reference/getEmitOutputSingleFile2.baseline b/tests/baselines/reference/getEmitOutputSingleFile2.baseline
index 21e28eb7feb4a..2a7b4ac367e8e 100644
--- a/tests/baselines/reference/getEmitOutputSingleFile2.baseline
+++ b/tests/baselines/reference/getEmitOutputSingleFile2.baseline
@@ -5,13 +5,13 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var x1 = "hello world";
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 FileName : declSingleFile.d.ts
 declare var x: number;
 declare class Bar {
diff --git a/tests/baselines/reference/getEmitOutputSourceMap.baseline b/tests/baselines/reference/getEmitOutputSourceMap.baseline
index 5859da0bb3eeb..65257d63607e7 100644
--- a/tests/baselines/reference/getEmitOutputSourceMap.baseline
+++ b/tests/baselines/reference/getEmitOutputSourceMap.baseline
@@ -7,5 +7,5 @@ var M = (function () {
     function M() {
     }
     return M;
-})();
+}());
 //# sourceMappingURL=inputFile.js.map
diff --git a/tests/baselines/reference/getEmitOutputSourceMap2.baseline b/tests/baselines/reference/getEmitOutputSourceMap2.baseline
index c07c134519f6b..33c23a7ee48ce 100644
--- a/tests/baselines/reference/getEmitOutputSourceMap2.baseline
+++ b/tests/baselines/reference/getEmitOutputSourceMap2.baseline
@@ -7,7 +7,7 @@ var M = (function () {
     function M() {
     }
     return M;
-})();
+}());
 //# sourceMappingURL=inputFile1.js.map
 EmitSkipped: false
 FileName : sample/outDir/inputFile2.js.map
diff --git a/tests/baselines/reference/getEmitOutputSourceRoot.baseline b/tests/baselines/reference/getEmitOutputSourceRoot.baseline
index 2c5e963b8b519..d38078a08e315 100644
--- a/tests/baselines/reference/getEmitOutputSourceRoot.baseline
+++ b/tests/baselines/reference/getEmitOutputSourceRoot.baseline
@@ -7,5 +7,5 @@ var M = (function () {
     function M() {
     }
     return M;
-})();
+}());
 //# sourceMappingURL=inputFile.js.map
diff --git a/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline b/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline
index fa4f33168226d..50a6ad68605ee 100644
--- a/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline
+++ b/tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline
@@ -7,7 +7,7 @@ var M = (function () {
     function M() {
     }
     return M;
-})();
+}());
 //# sourceMappingURL=inputFile1.js.map
 EmitSkipped: false
 FileName : tests/cases/fourslash/inputFile2.js.map
@@ -17,5 +17,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 //# sourceMappingURL=inputFile2.js.map
diff --git a/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline b/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline
index 72167679f58f3..bebd1ff1dd128 100644
--- a/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline
+++ b/tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline
@@ -7,7 +7,7 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 //# sourceMappingURL=inputFile1.js.mapFileName : tests/cases/fourslash/inputFile1.d.ts
 declare var t: number;
 declare class Bar {
diff --git a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
index 2606ea7adbb90..5b668fd65e86b 100644
--- a/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
+++ b/tests/baselines/reference/getEmitOutputTsxFile_React.baseline
@@ -7,7 +7,7 @@ var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 //# sourceMappingURL=inputFile1.js.mapFileName : tests/cases/fourslash/inputFile1.d.ts
 declare var t: number;
 declare class Bar {
diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline
index 4fda32ad7c45b..af4ccd10580f2 100644
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile.baseline
@@ -7,5 +7,5 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 
diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
index 3f2e0064fc7f4..8e43219e00553 100644
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
@@ -7,7 +7,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 exports.Foo = Foo;
 
 EmitSkipped: false
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline
index 2f27152892b67..8ba493e04b7d6 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline
@@ -8,7 +8,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.foo = new C();
 })(M || (M = {}));
 
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
index 915eb121f5f67..bf12bd35548ef 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
@@ -8,7 +8,7 @@ define(["require", "exports"], function (require, exports) {
         function C() {
         }
         return C;
-    })();
+    }());
     var M;
     (function (M) {
         M.foo = new C();
diff --git a/tests/baselines/reference/getSetAccessorContextualTyping.js b/tests/baselines/reference/getSetAccessorContextualTyping.js
index d1415e1d4e717..c717fb7d5e337 100644
--- a/tests/baselines/reference/getSetAccessorContextualTyping.js
+++ b/tests/baselines/reference/getSetAccessorContextualTyping.js
@@ -65,4 +65,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/getterMissingReturnError.js b/tests/baselines/reference/getterMissingReturnError.js
index 76566d9346e89..63fd3f57db119 100644
--- a/tests/baselines/reference/getterMissingReturnError.js
+++ b/tests/baselines/reference/getterMissingReturnError.js
@@ -17,4 +17,4 @@ var test = (function () {
         configurable: true
     });
     return test;
-})();
+}());
diff --git a/tests/baselines/reference/getterThatThrowsShouldNotNeedReturn.js b/tests/baselines/reference/getterThatThrowsShouldNotNeedReturn.js
index c48e5c9c6bcdb..e38058fbebf5c 100644
--- a/tests/baselines/reference/getterThatThrowsShouldNotNeedReturn.js
+++ b/tests/baselines/reference/getterThatThrowsShouldNotNeedReturn.js
@@ -24,4 +24,4 @@ var Greeter = (function () {
         throw ''; // should not raise an error
     };
     return Greeter;
-})();
+}());
diff --git a/tests/baselines/reference/gettersAndSetters.js b/tests/baselines/reference/gettersAndSetters.js
index 92f959e598897..16d66c7dc71f6 100644
--- a/tests/baselines/reference/gettersAndSetters.js
+++ b/tests/baselines/reference/gettersAndSetters.js
@@ -67,7 +67,7 @@ var C = (function () {
     });
     C.barBack = "";
     return C;
-})();
+}());
 var c = new C();
 var foo = c.Foo;
 c.Foo = "foov";
diff --git a/tests/baselines/reference/gettersAndSettersAccessibility.js b/tests/baselines/reference/gettersAndSettersAccessibility.js
index e0cfa3d17c5f4..b3b8d008d1e8a 100644
--- a/tests/baselines/reference/gettersAndSettersAccessibility.js
+++ b/tests/baselines/reference/gettersAndSettersAccessibility.js
@@ -17,4 +17,4 @@ var C99 = (function () {
         configurable: true
     });
     return C99;
-})();
+}());
diff --git a/tests/baselines/reference/gettersAndSettersErrors.js b/tests/baselines/reference/gettersAndSettersErrors.js
index d92f0d833f544..5c9c56b67cffb 100644
--- a/tests/baselines/reference/gettersAndSettersErrors.js
+++ b/tests/baselines/reference/gettersAndSettersErrors.js
@@ -38,7 +38,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var E = (function () {
     function E() {
     }
@@ -50,4 +50,4 @@ var E = (function () {
         configurable: true
     });
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/gettersAndSettersTypesAgree.js b/tests/baselines/reference/gettersAndSettersTypesAgree.js
index 91d3d8449815d..86802a30431d7 100644
--- a/tests/baselines/reference/gettersAndSettersTypesAgree.js
+++ b/tests/baselines/reference/gettersAndSettersTypesAgree.js
@@ -31,6 +31,6 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var o1 = { get Foo() { return 0; }, set Foo(val) { } }; // ok - types agree (inference)
 var o2 = { get Foo() { return 0; }, set Foo(val) { } }; // ok - types agree
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index 75387f6f2c23a..2a04541ef2818 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -743,7 +743,7 @@ define(["require", "exports"], function (require, exports) {
             configurable: true
         });
         return C;
-    })();
+    }());
     var M;
     (function (M_1) {
         var V;
@@ -792,7 +792,7 @@ define(["require", "exports"], function (require, exports) {
                 configurable: true
             });
             return C;
-        })();
+        }());
         var M;
         (function (M) {
             var V;
@@ -802,7 +802,7 @@ define(["require", "exports"], function (require, exports) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             ;
             ;
             ;
@@ -813,7 +813,7 @@ define(["require", "exports"], function (require, exports) {
                 function eC() {
                 }
                 return eC;
-            })();
+            }());
             M.eC = eC;
             ;
             ;
@@ -868,7 +868,7 @@ define(["require", "exports"], function (require, exports) {
                 configurable: true
             });
             return eC;
-        })();
+        }());
         M_1.eC = eC;
         var eM;
         (function (eM) {
@@ -879,7 +879,7 @@ define(["require", "exports"], function (require, exports) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             ;
             ;
             ;
@@ -890,7 +890,7 @@ define(["require", "exports"], function (require, exports) {
                 function eC() {
                 }
                 return eC;
-            })();
+            }());
             eM.eC = eC;
             ;
             ;
@@ -947,7 +947,7 @@ define(["require", "exports"], function (require, exports) {
             configurable: true
         });
         return eC;
-    })();
+    }());
     exports.eC = eC;
     var eM;
     (function (eM_1) {
@@ -997,7 +997,7 @@ define(["require", "exports"], function (require, exports) {
                 configurable: true
             });
             return C;
-        })();
+        }());
         var M;
         (function (M) {
             var V;
@@ -1007,7 +1007,7 @@ define(["require", "exports"], function (require, exports) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             ;
             ;
             ;
@@ -1018,7 +1018,7 @@ define(["require", "exports"], function (require, exports) {
                 function eC() {
                 }
                 return eC;
-            })();
+            }());
             M.eC = eC;
             ;
             ;
@@ -1073,7 +1073,7 @@ define(["require", "exports"], function (require, exports) {
                 configurable: true
             });
             return eC;
-        })();
+        }());
         eM_1.eC = eC;
         var eM;
         (function (eM) {
@@ -1084,7 +1084,7 @@ define(["require", "exports"], function (require, exports) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             ;
             ;
             ;
@@ -1095,7 +1095,7 @@ define(["require", "exports"], function (require, exports) {
                 function eC() {
                 }
                 return eC;
-            })();
+            }());
             eM.eC = eC;
             ;
             ;
diff --git a/tests/baselines/reference/grammarAmbiguities1.js b/tests/baselines/reference/grammarAmbiguities1.js
index 1917acb712848..f650030fd44f2 100644
--- a/tests/baselines/reference/grammarAmbiguities1.js
+++ b/tests/baselines/reference/grammarAmbiguities1.js
@@ -16,13 +16,13 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.bar = function () { };
     return B;
-})();
+}());
 function f(x) { return x; }
 function g(x) { return f(x); }
 g(7);
diff --git a/tests/baselines/reference/heterogeneousArrayAndOverloads.js b/tests/baselines/reference/heterogeneousArrayAndOverloads.js
index b816b87e3d12c..b9ef4bc4b6e6a 100644
--- a/tests/baselines/reference/heterogeneousArrayAndOverloads.js
+++ b/tests/baselines/reference/heterogeneousArrayAndOverloads.js
@@ -23,4 +23,4 @@ var arrTest = (function () {
         this.test([1, 2, "hi", 5]); // Error
     };
     return arrTest;
-})();
+}());
diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.js b/tests/baselines/reference/heterogeneousArrayLiterals.js
index 45ea6429979b3..e482f0d33d3c2 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.js
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.js
@@ -156,21 +156,21 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 var base;
 var derived;
 var derived2;
diff --git a/tests/baselines/reference/ifDoWhileStatements.js b/tests/baselines/reference/ifDoWhileStatements.js
index a2553c674b090..75762ffbb54de 100644
--- a/tests/baselines/reference/ifDoWhileStatements.js
+++ b/tests/baselines/reference/ifDoWhileStatements.js
@@ -173,19 +173,19 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(C);
+}(C));
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 function F(x) { return 42; }
 function F2(x) { return x < 42; }
 var M;
@@ -194,7 +194,7 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     function F2(x) { return x.toString(); }
     M.F2 = F2;
@@ -205,7 +205,7 @@ var N;
         function A() {
         }
         return A;
-    })();
+    }());
     N.A = A;
     function F2(x) { return x.toString(); }
     N.F2 = F2;
diff --git a/tests/baselines/reference/illegalModifiersOnClassElements.js b/tests/baselines/reference/illegalModifiersOnClassElements.js
index b9a40fa6aa0e1..dc1b368260393 100644
--- a/tests/baselines/reference/illegalModifiersOnClassElements.js
+++ b/tests/baselines/reference/illegalModifiersOnClassElements.js
@@ -11,4 +11,4 @@ var C = (function () {
         this.bar = 1;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/illegalSuperCallsInConstructor.js b/tests/baselines/reference/illegalSuperCallsInConstructor.js
index c3a52473744e3..88671ce1ceeea 100644
--- a/tests/baselines/reference/illegalSuperCallsInConstructor.js
+++ b/tests/baselines/reference/illegalSuperCallsInConstructor.js
@@ -30,7 +30,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -48,4 +48,4 @@ var Derived = (function (_super) {
         };
     }
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/implementClausePrecedingExtends.js b/tests/baselines/reference/implementClausePrecedingExtends.js
index a929c2fb96616..ba3583c3051aa 100644
--- a/tests/baselines/reference/implementClausePrecedingExtends.js
+++ b/tests/baselines/reference/implementClausePrecedingExtends.js
@@ -12,11 +12,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/implementGenericWithMismatchedTypes.js b/tests/baselines/reference/implementGenericWithMismatchedTypes.js
index a030ebc3c1d51..e9c3a0e0ffd43 100644
--- a/tests/baselines/reference/implementGenericWithMismatchedTypes.js
+++ b/tests/baselines/reference/implementGenericWithMismatchedTypes.js
@@ -30,7 +30,7 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
@@ -38,4 +38,4 @@ var C2 = (function () {
         return null;
     };
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.js b/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.js
index 16e904c3497bc..ec2406f65fd9e 100644
--- a/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.js
+++ b/tests/baselines/reference/implementInterfaceAnyMemberWithVoid.js
@@ -16,4 +16,4 @@ var Bug = (function () {
     Bug.prototype.foo = function (value) {
     };
     return Bug;
-})();
+}());
diff --git a/tests/baselines/reference/implementPublicPropertyAsPrivate.js b/tests/baselines/reference/implementPublicPropertyAsPrivate.js
index 4a946801da366..8980fba52f37e 100644
--- a/tests/baselines/reference/implementPublicPropertyAsPrivate.js
+++ b/tests/baselines/reference/implementPublicPropertyAsPrivate.js
@@ -12,4 +12,4 @@ var C = (function () {
         this.x = 0; // should raise error at class decl
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.js
index adb0271e7a58e..835f37a2eed13 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates.js
@@ -29,24 +29,24 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var Bar2 = (function () {
     function Bar2() {
     }
     return Bar2;
-})();
+}());
 var Bar3 = (function () {
     function Bar3() {
     }
     return Bar3;
-})();
+}());
 var Bar4 = (function () {
     function Bar4() {
     }
     return Bar4;
-})();
+}());
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
index cfa5ccf41506e..8fec5dc27da52 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
@@ -95,28 +95,28 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Bar = (function (_super) {
     __extends(Bar, _super);
     function Bar() {
         _super.apply(this, arguments);
     }
     return Bar;
-})(Foo);
+}(Foo));
 var Bar2 = (function (_super) {
     __extends(Bar2, _super);
     function Bar2() {
         _super.apply(this, arguments);
     }
     return Bar2;
-})(Foo);
+}(Foo));
 var Bar3 = (function (_super) {
     __extends(Bar3, _super);
     function Bar3() {
         _super.apply(this, arguments);
     }
     return Bar3;
-})(Foo);
+}(Foo));
 // another level of indirection
 var M;
 (function (M) {
@@ -124,35 +124,35 @@ var M;
         function Foo() {
         }
         return Foo;
-    })();
+    }());
     var Baz = (function (_super) {
         __extends(Baz, _super);
         function Baz() {
             _super.apply(this, arguments);
         }
         return Baz;
-    })(Foo);
+    }(Foo));
     var Bar = (function (_super) {
         __extends(Bar, _super);
         function Bar() {
             _super.apply(this, arguments);
         }
         return Bar;
-    })(Foo);
+    }(Foo));
     var Bar2 = (function (_super) {
         __extends(Bar2, _super);
         function Bar2() {
             _super.apply(this, arguments);
         }
         return Bar2;
-    })(Foo);
+    }(Foo));
     var Bar3 = (function (_super) {
         __extends(Bar3, _super);
         function Bar3() {
             _super.apply(this, arguments);
         }
         return Bar3;
-    })(Foo);
+    }(Foo));
 })(M || (M = {}));
 // two levels of privates
 var M2;
@@ -161,21 +161,21 @@ var M2;
         function Foo() {
         }
         return Foo;
-    })();
+    }());
     var Baz = (function (_super) {
         __extends(Baz, _super);
         function Baz() {
             _super.apply(this, arguments);
         }
         return Baz;
-    })(Foo);
+    }(Foo));
     var Bar = (function (_super) {
         __extends(Bar, _super);
         function Bar() {
             _super.apply(this, arguments);
         }
         return Bar;
-    })(Foo);
+    }(Foo));
     var b;
     var r1 = b.z;
     var r2 = b.x; // error
@@ -186,12 +186,12 @@ var M2;
             _super.apply(this, arguments);
         }
         return Bar2;
-    })(Foo);
+    }(Foo));
     var Bar3 = (function (_super) {
         __extends(Bar3, _super);
         function Bar3() {
             _super.apply(this, arguments);
         }
         return Bar3;
-    })(Foo);
+    }(Foo));
 })(M2 || (M2 = {}));
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
index 39f30424321d6..915e652056cc4 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
@@ -51,52 +51,52 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var Bar2 = (function () {
     function Bar2() {
     }
     return Bar2;
-})();
+}());
 var Bar3 = (function () {
     function Bar3() {
     }
     return Bar3;
-})();
+}());
 var Bar4 = (function () {
     function Bar4() {
     }
     return Bar4;
-})();
+}());
 var Bar5 = (function (_super) {
     __extends(Bar5, _super);
     function Bar5() {
         _super.apply(this, arguments);
     }
     return Bar5;
-})(Foo);
+}(Foo));
 var Bar6 = (function (_super) {
     __extends(Bar6, _super);
     function Bar6() {
         _super.apply(this, arguments);
     }
     return Bar6;
-})(Foo);
+}(Foo));
 var Bar7 = (function (_super) {
     __extends(Bar7, _super);
     function Bar7() {
         _super.apply(this, arguments);
     }
     return Bar7;
-})(Foo);
+}(Foo));
 var Bar8 = (function (_super) {
     __extends(Bar8, _super);
     function Bar8() {
         _super.apply(this, arguments);
     }
     return Bar8;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/implementsClauseAlreadySeen.js b/tests/baselines/reference/implementsClauseAlreadySeen.js
index abb288866158e..0aa3afe4b3e4f 100644
--- a/tests/baselines/reference/implementsClauseAlreadySeen.js
+++ b/tests/baselines/reference/implementsClauseAlreadySeen.js
@@ -11,10 +11,10 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     D.prototype.baz = function () { };
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/implementsInClassExpression.js b/tests/baselines/reference/implementsInClassExpression.js
index 9ac092289f549..eefd058ec2e2c 100644
--- a/tests/baselines/reference/implementsInClassExpression.js
+++ b/tests/baselines/reference/implementsInClassExpression.js
@@ -13,4 +13,4 @@ var cls = (function () {
     }
     class_1.prototype.doThing = function () { };
     return class_1;
-})();
+}());
diff --git a/tests/baselines/reference/implicitAnyAnyReturningFunction.js b/tests/baselines/reference/implicitAnyAnyReturningFunction.js
index 2ba13835f28a1..13fe799a852df 100644
--- a/tests/baselines/reference/implicitAnyAnyReturningFunction.js
+++ b/tests/baselines/reference/implicitAnyAnyReturningFunction.js
@@ -39,7 +39,7 @@ var C = (function () {
         return someLocal;
     };
     return C;
-})();
+}());
 
 
 //// [implicitAnyAnyReturningFunction.d.ts]
diff --git a/tests/baselines/reference/implicitAnyCastedValue.js b/tests/baselines/reference/implicitAnyCastedValue.js
index be6bd1bfef34b..372f14647a179 100644
--- a/tests/baselines/reference/implicitAnyCastedValue.js
+++ b/tests/baselines/reference/implicitAnyCastedValue.js
@@ -104,7 +104,7 @@ var C = (function () {
         return this.foo; // this should not be an error
     };
     return C;
-})();
+}());
 var C1 = (function () {
     function C1() {
         this.getValue = null; // this should be an error
@@ -124,7 +124,7 @@ var C1 = (function () {
         configurable: true
     });
     return C1;
-})();
+}());
 function castedNull() {
     return null; // this should not be an error
 }
diff --git a/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js b/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js
index 59d625fff4ad4..a3a2e3d4b3115 100644
--- a/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js
+++ b/tests/baselines/reference/implicitAnyDeclareMemberWithoutType2.js
@@ -17,4 +17,4 @@ var C = (function () {
     } // error at "c1, c2"
     C.prototype.funcOfC = function (f1, f2, f3) { }; // error at "f1,f2"
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.js b/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.js
index 63f90a1aaa7f1..70c90f4c484f0 100644
--- a/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.js
+++ b/tests/baselines/reference/implicitAnyDeclareTypePropertyWithoutType.js
@@ -22,7 +22,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 // this should be an error
 var x; // error at "y,z"
 var x1; // error at "z1" 
diff --git a/tests/baselines/reference/implicitAnyFromCircularInference.js b/tests/baselines/reference/implicitAnyFromCircularInference.js
index d818ea1710599..9fa4f3ff225f0 100644
--- a/tests/baselines/reference/implicitAnyFromCircularInference.js
+++ b/tests/baselines/reference/implicitAnyFromCircularInference.js
@@ -81,7 +81,7 @@ var C = (function () {
         this.s = foo(this);
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -94,4 +94,4 @@ var D = (function () {
         configurable: true
     });
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js
index bc5b9453665f0..ce25562841c8e 100644
--- a/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js
+++ b/tests/baselines/reference/implicitAnyFunctionInvocationWithAnyArguements.js
@@ -65,7 +65,7 @@ var C = (function () {
     function C(emtpyArray, variable) {
     }
     return C;
-})();
+}());
 var newC = new C([], undefined);
 var newC1 = new C([], arg0);
 var newC2 = new C([], null);
diff --git a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js
index 82eb56fbde60f..69740a0ad31ef 100644
--- a/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js
+++ b/tests/baselines/reference/implicitAnyFunctionReturnNullOrUndefined.js
@@ -38,7 +38,7 @@ var C = (function () {
         return undefined;
     };
     return C;
-})();
+}());
 // this should not be an error
 function foo1() { return null; }
 function bar1() { return undefined; }
diff --git a/tests/baselines/reference/implicitAnyGenerics.js b/tests/baselines/reference/implicitAnyGenerics.js
index daea0dfe54c33..07478cf001114 100644
--- a/tests/baselines/reference/implicitAnyGenerics.js
+++ b/tests/baselines/reference/implicitAnyGenerics.js
@@ -31,7 +31,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = new C();
 var c2 = new C();
 var c3 = new C();
@@ -40,7 +40,7 @@ var D = (function () {
     function D(x) {
     }
     return D;
-})();
+}());
 var d = new D(null);
 var d2 = new D(1);
 var d3 = new D(1);
diff --git a/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.js b/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.js
index ac3b5e6649367..3997a56db0d37 100644
--- a/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.js
+++ b/tests/baselines/reference/implicitAnyGetAndSetAccessorWithAnyReturnType.js
@@ -41,7 +41,7 @@ var GetAndSet = (function () {
         configurable: true
     });
     return GetAndSet;
-})();
+}());
 var SetterOnly = (function () {
     function SetterOnly() {
     }
@@ -52,7 +52,7 @@ var SetterOnly = (function () {
         configurable: true
     });
     return SetterOnly;
-})();
+}());
 var GetterOnly = (function () {
     function GetterOnly() {
     }
@@ -64,4 +64,4 @@ var GetterOnly = (function () {
         configurable: true
     });
     return GetterOnly;
-})();
+}());
diff --git a/tests/baselines/reference/implicitAnyInCatch.js b/tests/baselines/reference/implicitAnyInCatch.js
index c35e92372e303..f833135f00d30 100644
--- a/tests/baselines/reference/implicitAnyInCatch.js
+++ b/tests/baselines/reference/implicitAnyInCatch.js
@@ -29,4 +29,4 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/implicitAnyWidenToAny.js b/tests/baselines/reference/implicitAnyWidenToAny.js
index 838593a88ef9e..0779a16674479 100644
--- a/tests/baselines/reference/implicitAnyWidenToAny.js
+++ b/tests/baselines/reference/implicitAnyWidenToAny.js
@@ -38,7 +38,7 @@ var AnimalObj = (function () {
     function AnimalObj() {
     }
     return AnimalObj;
-})();
+}());
 var foo = 5;
 var bar = "Hello World";
 var foo1 = null;
diff --git a/tests/baselines/reference/importAliasIdentifiers.js b/tests/baselines/reference/importAliasIdentifiers.js
index 7bd15b28c66f5..084b6694e9ca5 100644
--- a/tests/baselines/reference/importAliasIdentifiers.js
+++ b/tests/baselines/reference/importAliasIdentifiers.js
@@ -55,7 +55,7 @@ var moduleA;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     moduleA.Point = Point;
 })(moduleA || (moduleA = {}));
 var alias = moduleA;
@@ -66,7 +66,7 @@ var clodule = (function () {
     function clodule() {
     }
     return clodule;
-})();
+}());
 var clodule;
 (function (clodule) {
     var Point = { x: 0, y: 0 };
diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.js b/tests/baselines/reference/importAndVariableDeclarationConflict2.js
index 6d188b373b74a..221fd20e7ecea 100644
--- a/tests/baselines/reference/importAndVariableDeclarationConflict2.js
+++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.js
@@ -24,4 +24,4 @@ var C = (function () {
         var x = '';
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js
index 5340c3049a213..60e142dd5f71b 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -17,7 +17,7 @@ var Greeter = (function () {
     }
     Greeter.prototype.greet = function () { return 'greet'; };
     return Greeter;
-})();
+}());
 exports.Greeter = Greeter;
 //// [importAsBaseClass_1.js]
 "use strict";
@@ -33,4 +33,4 @@ var Hello = (function (_super) {
         _super.apply(this, arguments);
     }
     return Hello;
-})(Greeter);
+}(Greeter));
diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js
index c7cc4fe8332b6..47bf5a1b2a133 100644
--- a/tests/baselines/reference/importDecl.js
+++ b/tests/baselines/reference/importDecl.js
@@ -87,7 +87,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
@@ -97,7 +97,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 var x;
 function foo() { return null; }
@@ -108,7 +108,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
@@ -118,7 +118,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
index 958b154cd282c..c2cc0b8ea7a3b 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
@@ -17,7 +17,7 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 exports.B = B;
 //// [importDeclarationUsedAsTypeQuery_1.js]
 "use strict";
diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js
index 31932455784d6..7b41e4400c5b0 100644
--- a/tests/baselines/reference/importImportOnlyModule.js
+++ b/tests/baselines/reference/importImportOnlyModule.js
@@ -24,7 +24,7 @@ define(["require", "exports"], function (require, exports) {
         }
         C1.s1 = true;
         return C1;
-    })();
+    }());
     exports.C1 = C1;
 });
 //// [foo_1.js]
diff --git a/tests/baselines/reference/importInTypePosition.js b/tests/baselines/reference/importInTypePosition.js
index c0d64a4ef7bd7..542c6f34a4894 100644
--- a/tests/baselines/reference/importInTypePosition.js
+++ b/tests/baselines/reference/importInTypePosition.js
@@ -30,7 +30,7 @@ var A;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
     A.Origin = new Point(0, 0);
 })(A || (A = {}));
diff --git a/tests/baselines/reference/importShadowsGlobalName.js b/tests/baselines/reference/importShadowsGlobalName.js
index cd0cd1791eb4c..dbbf171063297 100644
--- a/tests/baselines/reference/importShadowsGlobalName.js
+++ b/tests/baselines/reference/importShadowsGlobalName.js
@@ -17,7 +17,7 @@ define(["require", "exports"], function (require, exports) {
         function Foo() {
         }
         return Foo;
-    })();
+    }());
     return Foo;
 });
 //// [Bar.js]
@@ -34,6 +34,6 @@ define(["require", "exports", 'Foo'], function (require, exports, Error) {
             _super.apply(this, arguments);
         }
         return Bar;
-    })(Error);
+    }(Error));
     return Bar;
 });
diff --git a/tests/baselines/reference/importStatements.js b/tests/baselines/reference/importStatements.js
index b8d06a3546eb5..a91b54f3a6d27 100644
--- a/tests/baselines/reference/importStatements.js
+++ b/tests/baselines/reference/importStatements.js
@@ -43,7 +43,7 @@ var A;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
     A.Origin = new Point(0, 0);
 })(A || (A = {}));
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index 7fa341cd28a53..1d242a530236d 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -17,7 +17,7 @@ var Super = (function () {
     function Super() {
     }
     return Super;
-})();
+}());
 exports.Super = Super;
 //// [importUsedInExtendsList1_1.js]
 "use strict";
@@ -34,6 +34,6 @@ var Sub = (function (_super) {
         _super.apply(this, arguments);
     }
     return Sub;
-})(foo.Super);
+}(foo.Super));
 var s;
 var r = s.foo;
diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js
index 68d2ee34671dd..ffc4491e50ac1 100644
--- a/tests/baselines/reference/import_reference-exported-alias.js
+++ b/tests/baselines/reference/import_reference-exported-alias.js
@@ -35,7 +35,7 @@ define(["require", "exports"], function (require, exports) {
                     return "Bill Gates";
                 };
                 return UserServices;
-            })();
+            }());
             Services.UserServices = UserServices;
         })(Services = App.Services || (App.Services = {}));
     })(App || (App = {}));
diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js
index 6f329afbf54d8..1d91f10f672ee 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.js
+++ b/tests/baselines/reference/import_reference-to-type-alias.js
@@ -31,7 +31,7 @@ define(["require", "exports"], function (require, exports) {
                     return "Bill Gates";
                 };
                 return UserServices;
-            })();
+            }());
             Services.UserServices = UserServices;
         })(Services = App.Services || (App.Services = {}));
     })(App = exports.App || (exports.App = {}));
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
index ed6470751ed08..d67c53c63491e 100644
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
@@ -17,7 +17,7 @@ define(["require", "exports"], function (require, exports) {
         function Host() {
         }
         return Host;
-    })();
+    }());
     exports.Host = Host;
 });
 //// [consumer.js]
diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js
index d342deedef278..754bac96c2c6b 100644
--- a/tests/baselines/reference/importedAliasesInTypePositions.js
+++ b/tests/baselines/reference/importedAliasesInTypePositions.js
@@ -35,7 +35,7 @@ define(["require", "exports"], function (require, exports) {
                         ReferredTo.prototype.doSomething = function () {
                         };
                         return ReferredTo;
-                    })();
+                    }());
                     name.ReferredTo = ReferredTo;
                 })(name = mod.name || (mod.name = {}));
             })(mod = nested.mod || (nested.mod = {}));
@@ -52,6 +52,6 @@ define(["require", "exports"], function (require, exports) {
                 this.referred = referred;
             }
             return UsesReferredType;
-        })();
+        }());
     })(ImportingModule = exports.ImportingModule || (exports.ImportingModule = {}));
 });
diff --git a/tests/baselines/reference/importedModuleAddToGlobal.js b/tests/baselines/reference/importedModuleAddToGlobal.js
index 015631dc9659c..b74b96f2eb623 100644
--- a/tests/baselines/reference/importedModuleAddToGlobal.js
+++ b/tests/baselines/reference/importedModuleAddToGlobal.js
@@ -23,7 +23,7 @@ var B;
         function B() {
         }
         return B;
-    })();
+    }());
     B_1.B = B;
 })(B || (B = {}));
 var C;
diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js
index a12ab331c48f7..8f9649c676837 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.js
+++ b/tests/baselines/reference/importedModuleClassNameClash.js
@@ -13,5 +13,5 @@ define(["require", "exports"], function (require, exports) {
         function foo() {
         }
         return foo;
-    })();
+    }());
 });
diff --git a/tests/baselines/reference/inOperatorWithGeneric.js b/tests/baselines/reference/inOperatorWithGeneric.js
index b34d510f5a32d..eb2df95bbde5b 100644
--- a/tests/baselines/reference/inOperatorWithGeneric.js
+++ b/tests/baselines/reference/inOperatorWithGeneric.js
@@ -15,4 +15,4 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/incompatibleTypes.js b/tests/baselines/reference/incompatibleTypes.js
index 7e24afecf5fa9..6f786aee354e2 100644
--- a/tests/baselines/reference/incompatibleTypes.js
+++ b/tests/baselines/reference/incompatibleTypes.js
@@ -83,7 +83,7 @@ var C1 = (function () {
         return "s";
     };
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
@@ -91,17 +91,17 @@ var C2 = (function () {
         return 0;
     };
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
     }
     return C4;
-})();
+}());
 function if1(a) { }
 var c1;
 var c2;
diff --git a/tests/baselines/reference/incorrectClassOverloadChain.js b/tests/baselines/reference/incorrectClassOverloadChain.js
index bf02a09014ce9..8ebbc11d90e02 100644
--- a/tests/baselines/reference/incorrectClassOverloadChain.js
+++ b/tests/baselines/reference/incorrectClassOverloadChain.js
@@ -11,4 +11,4 @@ var C = (function () {
         this.x = 1;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/incrementOnTypeParameter.js b/tests/baselines/reference/incrementOnTypeParameter.js
index bec2bcd9d0598..2f3de20c4193b 100644
--- a/tests/baselines/reference/incrementOnTypeParameter.js
+++ b/tests/baselines/reference/incrementOnTypeParameter.js
@@ -19,4 +19,4 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js
index 6cd7afc5a60be..e99340a53e290 100644
--- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.js
@@ -58,7 +58,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js
index 73ec64dfc55d8..636ca74ba0861 100644
--- a/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js
+++ b/tests/baselines/reference/incrementOperatorWithAnyOtherTypeInvalidOperations.js
@@ -87,7 +87,7 @@ var A = (function () {
         return a;
     };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.js b/tests/baselines/reference/incrementOperatorWithNumberType.js
index cf7ce435cb061..16a56b45a2025 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberType.js
+++ b/tests/baselines/reference/incrementOperatorWithNumberType.js
@@ -47,7 +47,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js
index 17820b7bd8662..0bdb75eb0fa97 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js
+++ b/tests/baselines/reference/incrementOperatorWithNumberTypeInvalidOperations.js
@@ -56,7 +56,7 @@ var A = (function () {
     }
     A.foo = function () { return 1; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js
index 5bdba8dfee527..4e936e335142d 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedBooleanType.js
@@ -63,7 +63,7 @@ var A = (function () {
     }
     A.foo = function () { return true; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js
index baeaf9555fbff..781251d56b9d5 100644
--- a/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js
+++ b/tests/baselines/reference/incrementOperatorWithUnsupportedStringType.js
@@ -75,7 +75,7 @@ var A = (function () {
     }
     A.foo = function () { return ""; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/indexClassByNumber.js b/tests/baselines/reference/indexClassByNumber.js
index 1725e5bf6a1da..8d5ecda30f5c5 100644
--- a/tests/baselines/reference/indexClassByNumber.js
+++ b/tests/baselines/reference/indexClassByNumber.js
@@ -13,6 +13,6 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
 var f = new foo();
 f[0] = 4; // Shouldn't be allowed
diff --git a/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.js b/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.js
index f586a19bf0e31..2aec01d1ff7d9 100644
--- a/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.js
+++ b/tests/baselines/reference/indexSignatureMustHaveTypeAnnotation.js
@@ -20,9 +20,9 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/indexSignatureTypeCheck2.js b/tests/baselines/reference/indexSignatureTypeCheck2.js
index 6dcc0f392a518..edc608d77e012 100644
--- a/tests/baselines/reference/indexSignatureTypeCheck2.js
+++ b/tests/baselines/reference/indexSignatureTypeCheck2.js
@@ -19,7 +19,7 @@ var IPropertySet = (function () {
     function IPropertySet() {
     }
     return IPropertySet;
-})();
+}());
 var ps = null;
 var index = "hello";
 ps[index] = 12;
diff --git a/tests/baselines/reference/indexSignatureWithAccessibilityModifier.js b/tests/baselines/reference/indexSignatureWithAccessibilityModifier.js
index 798fef924b9e1..6055849062cd9 100644
--- a/tests/baselines/reference/indexSignatureWithAccessibilityModifier.js
+++ b/tests/baselines/reference/indexSignatureWithAccessibilityModifier.js
@@ -12,4 +12,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/indexSignatureWithInitializer.js b/tests/baselines/reference/indexSignatureWithInitializer.js
index 490033dde0f3d..48b91c01d0377 100644
--- a/tests/baselines/reference/indexSignatureWithInitializer.js
+++ b/tests/baselines/reference/indexSignatureWithInitializer.js
@@ -13,4 +13,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/indexSignatureWithInitializer1.js b/tests/baselines/reference/indexSignatureWithInitializer1.js
index 16852fd417451..78a94d931abb0 100644
--- a/tests/baselines/reference/indexSignatureWithInitializer1.js
+++ b/tests/baselines/reference/indexSignatureWithInitializer1.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/indexSignatureWithoutTypeAnnotation1.js b/tests/baselines/reference/indexSignatureWithoutTypeAnnotation1.js
index bef6af3793168..8871299c102cb 100644
--- a/tests/baselines/reference/indexSignatureWithoutTypeAnnotation1.js
+++ b/tests/baselines/reference/indexSignatureWithoutTypeAnnotation1.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/indexTypeCheck.js b/tests/baselines/reference/indexTypeCheck.js
index 6e74111a3579c..bed15a58ae2d9 100644
--- a/tests/baselines/reference/indexTypeCheck.js
+++ b/tests/baselines/reference/indexTypeCheck.js
@@ -84,4 +84,4 @@ var Benchmark = (function () {
         this.results[name] = this.results[name];
     };
     return Benchmark;
-})();
+}());
diff --git a/tests/baselines/reference/indexWithoutParamType2.js b/tests/baselines/reference/indexWithoutParamType2.js
index 4197b0596eca4..c84a5a8855ba4 100644
--- a/tests/baselines/reference/indexWithoutParamType2.js
+++ b/tests/baselines/reference/indexWithoutParamType2.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/indexer2A.js b/tests/baselines/reference/indexer2A.js
index 867c30205ae75..5d5ef6e0aeabc 100644
--- a/tests/baselines/reference/indexer2A.js
+++ b/tests/baselines/reference/indexer2A.js
@@ -12,10 +12,10 @@ var IHeapObjectProperty = (function () {
     function IHeapObjectProperty() {
     }
     return IHeapObjectProperty;
-})();
+}());
 var IDirectChildrenMap = (function () {
     function IDirectChildrenMap() {
     }
     return IDirectChildrenMap;
-})();
+}());
 var directChildrenMap = {};
diff --git a/tests/baselines/reference/indexerA.js b/tests/baselines/reference/indexerA.js
index 5216026f714d0..dc8e92f22cf91 100644
--- a/tests/baselines/reference/indexerA.js
+++ b/tests/baselines/reference/indexerA.js
@@ -15,11 +15,11 @@ var JQueryElement = (function () {
     function JQueryElement() {
     }
     return JQueryElement;
-})();
+}());
 var JQuery = (function () {
     function JQuery() {
     }
     return JQuery;
-})();
+}());
 var jq = { 0: { id: "a" }, 1: { id: "b" } };
 jq[0].id;
diff --git a/tests/baselines/reference/indexerAsOptional.js b/tests/baselines/reference/indexerAsOptional.js
index 509e3890ec8b2..afe713a11022f 100644
--- a/tests/baselines/reference/indexerAsOptional.js
+++ b/tests/baselines/reference/indexerAsOptional.js
@@ -14,4 +14,4 @@ var indexSig2 = (function () {
     function indexSig2() {
     }
     return indexSig2;
-})();
+}());
diff --git a/tests/baselines/reference/indexerConstraints2.js b/tests/baselines/reference/indexerConstraints2.js
index 7e662bc66cc08..dd143da97e672 100644
--- a/tests/baselines/reference/indexerConstraints2.js
+++ b/tests/baselines/reference/indexerConstraints2.js
@@ -38,50 +38,50 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 // Inheritance
 var F = (function () {
     function F() {
     }
     return F;
-})();
+}());
 var G = (function (_super) {
     __extends(G, _super);
     function G() {
         _super.apply(this, arguments);
     }
     return G;
-})(F);
+}(F));
 // Other way
 var H = (function () {
     function H() {
     }
     return H;
-})();
+}());
 var I = (function (_super) {
     __extends(I, _super);
     function I() {
         _super.apply(this, arguments);
     }
     return I;
-})(H);
+}(H));
 // With hidden indexer
 var J = (function () {
     function J() {
     }
     return J;
-})();
+}());
 var K = (function (_super) {
     __extends(K, _super);
     function K() {
         _super.apply(this, arguments);
     }
     return K;
-})(J);
+}(J));
diff --git a/tests/baselines/reference/indexerReturningTypeParameter1.js b/tests/baselines/reference/indexerReturningTypeParameter1.js
index a4a385ff056ca..cdc1bdf19d1e5 100644
--- a/tests/baselines/reference/indexerReturningTypeParameter1.js
+++ b/tests/baselines/reference/indexerReturningTypeParameter1.js
@@ -23,6 +23,6 @@ var c = (function () {
         return null;
     };
     return c;
-})();
+}());
 var a2;
 var r2 = a2.groupBy();
diff --git a/tests/baselines/reference/indexerSignatureWithRestParam.js b/tests/baselines/reference/indexerSignatureWithRestParam.js
index 8a7defb049c51..3f6f149bd7f19 100644
--- a/tests/baselines/reference/indexerSignatureWithRestParam.js
+++ b/tests/baselines/reference/indexerSignatureWithRestParam.js
@@ -12,4 +12,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/indexersInClassType.js b/tests/baselines/reference/indexersInClassType.js
index d8f336539535b..9b085aa8fe279 100644
--- a/tests/baselines/reference/indexersInClassType.js
+++ b/tests/baselines/reference/indexersInClassType.js
@@ -25,7 +25,7 @@ var C = (function () {
         return this;
     };
     return C;
-})();
+}());
 var c = new C();
 var r = c.fn();
 var r2 = r[1];
diff --git a/tests/baselines/reference/indirectSelfReference.js b/tests/baselines/reference/indirectSelfReference.js
index bd838ed88107e..66d23a45b7267 100644
--- a/tests/baselines/reference/indirectSelfReference.js
+++ b/tests/baselines/reference/indirectSelfReference.js
@@ -14,11 +14,11 @@ var a = (function (_super) {
         _super.apply(this, arguments);
     }
     return a;
-})(b);
+}(b));
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/indirectSelfReferenceGeneric.js b/tests/baselines/reference/indirectSelfReferenceGeneric.js
index c9b4478ec13f2..99ab918e63142 100644
--- a/tests/baselines/reference/indirectSelfReferenceGeneric.js
+++ b/tests/baselines/reference/indirectSelfReferenceGeneric.js
@@ -14,11 +14,11 @@ var a = (function (_super) {
         _super.apply(this, arguments);
     }
     return a;
-})(b);
+}(b));
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inferSetterParamType.js b/tests/baselines/reference/inferSetterParamType.js
index c0be3a5c39405..33f785aab620f 100644
--- a/tests/baselines/reference/inferSetterParamType.js
+++ b/tests/baselines/reference/inferSetterParamType.js
@@ -32,7 +32,7 @@ var Foo = (function () {
         configurable: true
     });
     return Foo;
-})();
+}());
 var Foo2 = (function () {
     function Foo2() {
     }
@@ -46,4 +46,4 @@ var Foo2 = (function () {
         configurable: true
     });
     return Foo2;
-})();
+}());
diff --git a/tests/baselines/reference/inferentialTypingUsingApparentType3.js b/tests/baselines/reference/inferentialTypingUsingApparentType3.js
index 819ca05098dce..f637537536699 100644
--- a/tests/baselines/reference/inferentialTypingUsingApparentType3.js
+++ b/tests/baselines/reference/inferentialTypingUsingApparentType3.js
@@ -34,7 +34,7 @@ var CharField = (function () {
         return "Yup";
     };
     return CharField;
-})();
+}());
 var NumberField = (function () {
     function NumberField() {
     }
@@ -42,13 +42,13 @@ var NumberField = (function () {
         return 123;
     };
     return NumberField;
-})();
+}());
 var ObjectField = (function () {
     function ObjectField(fields) {
         this.fields = fields;
     }
     return ObjectField;
-})();
+}());
 var person = new ObjectField({
     id: new NumberField(),
     name: new CharField()
diff --git a/tests/baselines/reference/infinitelyExpandingOverloads.js b/tests/baselines/reference/infinitelyExpandingOverloads.js
index 1e84eba27cf13..a16baaa6d6c27 100644
--- a/tests/baselines/reference/infinitelyExpandingOverloads.js
+++ b/tests/baselines/reference/infinitelyExpandingOverloads.js
@@ -31,13 +31,13 @@ var Validator2 = (function () {
     function Validator2() {
     }
     return Validator2;
-})();
+}());
 var ViewModel = (function () {
     function ViewModel() {
         this.validationPlacements = new Array();
     }
     return ViewModel;
-})();
+}());
 var Widget = (function () {
     function Widget(viewModelType) {
     }
@@ -49,4 +49,4 @@ var Widget = (function () {
         configurable: true
     });
     return Widget;
-})();
+}());
diff --git a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
index f057b649cb610..6321f77d31fb0 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
@@ -34,19 +34,19 @@ var Functionality = (function () {
     function Functionality() {
     }
     return Functionality;
-})();
+}());
 var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var A = (function (_super) {
     __extends(A, _super);
     function A() {
         _super.apply(this, arguments);
     }
     return A;
-})(Base);
+}(Base));
 function o(type) {
 }
 o(A);
diff --git a/tests/baselines/reference/inheritFromGenericTypeParameter.js b/tests/baselines/reference/inheritFromGenericTypeParameter.js
index ec6be00785f98..f5bc099cb8dcf 100644
--- a/tests/baselines/reference/inheritFromGenericTypeParameter.js
+++ b/tests/baselines/reference/inheritFromGenericTypeParameter.js
@@ -14,4 +14,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(T);
+}(T));
diff --git a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.js b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.js
index 49bf2c8ac9701..dec161d95ac25 100644
--- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.js
+++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromDifferentOrigins.js
@@ -16,9 +16,9 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
index 93494c7256e45..9462df7a3c3af 100644
--- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
+++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
@@ -20,18 +20,18 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(B);
+}(B));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.js b/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.js
index 3c6181117a35d..fff751e4cd75c 100644
--- a/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.js
+++ b/tests/baselines/reference/inheritSameNamePropertiesWithDifferentVisibility.js
@@ -16,9 +16,9 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/inheritance.js b/tests/baselines/reference/inheritance.js
index b581ae894ae8a..52fbfaffddeca 100644
--- a/tests/baselines/reference/inheritance.js
+++ b/tests/baselines/reference/inheritance.js
@@ -44,45 +44,45 @@ var B1 = (function () {
     function B1() {
     }
     return B1;
-})();
+}());
 var B2 = (function () {
     function B2() {
     }
     return B2;
-})();
+}());
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
         _super.apply(this, arguments);
     }
     return D1;
-})(B1);
+}(B1));
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
         _super.apply(this, arguments);
     }
     return D2;
-})(B2);
+}(B2));
 var N = (function () {
     function N() {
     }
     return N;
-})();
+}());
 var ND = (function (_super) {
     __extends(ND, _super);
     function ND() {
         _super.apply(this, arguments);
     }
     return ND;
-})(N);
+}(N));
 var Good = (function () {
     function Good() {
         this.f = function () { return 0; };
     }
     Good.prototype.g = function () { return 0; };
     return Good;
-})();
+}());
 var Baad = (function (_super) {
     __extends(Baad, _super);
     function Baad() {
@@ -91,4 +91,4 @@ var Baad = (function (_super) {
     Baad.prototype.f = function () { return 0; };
     Baad.prototype.g = function (n) { return 0; };
     return Baad;
-})(Good);
+}(Good));
diff --git a/tests/baselines/reference/inheritance1.js b/tests/baselines/reference/inheritance1.js
index aa7775b990444..c65155ee55ccc 100644
--- a/tests/baselines/reference/inheritance1.js
+++ b/tests/baselines/reference/inheritance1.js
@@ -71,7 +71,7 @@ var Control = (function () {
     function Control() {
     }
     return Control;
-})();
+}());
 var Button = (function (_super) {
     __extends(Button, _super);
     function Button() {
@@ -79,7 +79,7 @@ var Button = (function (_super) {
     }
     Button.prototype.select = function () { };
     return Button;
-})(Control);
+}(Control));
 var TextBox = (function (_super) {
     __extends(TextBox, _super);
     function TextBox() {
@@ -87,33 +87,33 @@ var TextBox = (function (_super) {
     }
     TextBox.prototype.select = function () { };
     return TextBox;
-})(Control);
+}(Control));
 var ImageBase = (function (_super) {
     __extends(ImageBase, _super);
     function ImageBase() {
         _super.apply(this, arguments);
     }
     return ImageBase;
-})(Control);
+}(Control));
 var Image1 = (function (_super) {
     __extends(Image1, _super);
     function Image1() {
         _super.apply(this, arguments);
     }
     return Image1;
-})(Control);
+}(Control));
 var Locations = (function () {
     function Locations() {
     }
     Locations.prototype.select = function () { };
     return Locations;
-})();
+}());
 var Locations1 = (function () {
     function Locations1() {
     }
     Locations1.prototype.select = function () { };
     return Locations1;
-})();
+}());
 var sc;
 var c;
 var b;
diff --git a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
index 927ae9690492c..b416cf3fb93de 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
@@ -21,14 +21,14 @@ var A = (function () {
     }
     A.prototype.myMethod = function () { };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -36,4 +36,4 @@ var C = (function (_super) {
     }
     C.prototype.myMethod = function () { };
     return C;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
index 05d8dc2a5413d..25a977531ca45 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
@@ -21,14 +21,14 @@ var A = (function () {
     }
     A.prototype.myMethod = function () { };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -36,4 +36,4 @@ var C = (function (_super) {
     }
     C.prototype.myMethod = function () { };
     return C;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
index ddd87251f9f16..dfd055569257f 100644
--- a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
@@ -21,14 +21,14 @@ var A = (function () {
     }
     A.prototype.myMethod = function () { };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -36,4 +36,4 @@ var C = (function (_super) {
     }
     C.prototype.myMethod = function () { };
     return C;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
index eaf34df921b4f..b4efaa896211b 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
@@ -36,7 +36,7 @@ var a = (function () {
         configurable: true
     });
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -52,4 +52,4 @@ var b = (function (_super) {
         configurable: true
     });
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js b/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
index cd79d8c6964e5..5044a8e03ac29 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
@@ -27,7 +27,7 @@ var a = (function () {
         return "20";
     };
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -43,4 +43,4 @@ var b = (function (_super) {
         configurable: true
     });
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
index 18c1ab3395244..6ebdc336a6445 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
@@ -22,7 +22,7 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -38,4 +38,4 @@ var b = (function (_super) {
         configurable: true
     });
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
index 5c2542517189f..3ddff027c1a01 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
@@ -33,7 +33,7 @@ var a = (function () {
         configurable: true
     });
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -43,4 +43,4 @@ var b = (function (_super) {
         return "20";
     };
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
index e2d3d9551c2d9..a6c3beea4efb3 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
@@ -24,7 +24,7 @@ var a = (function () {
         return "10";
     };
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -34,4 +34,4 @@ var b = (function (_super) {
         return "20";
     };
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js b/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
index b1d64aeb2c83f..94b602d29d9ee 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
@@ -19,7 +19,7 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -29,4 +29,4 @@ var b = (function (_super) {
         return "20";
     };
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js b/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
index bfa5d3fb801e3..a8fc4d5a3dd71 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
@@ -33,11 +33,11 @@ var a = (function () {
         configurable: true
     });
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js b/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
index d84f4879632a2..7d5cdb43e96c8 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
@@ -22,11 +22,11 @@ var a = (function () {
         return "20";
     };
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
index 8677d502273ab..648f1d1622e92 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
@@ -17,11 +17,11 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
index 73d3b4aa6cb43..59675c56e5fd0 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
@@ -17,14 +17,14 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var a = new A();
 var b1 = new B(); // no error
 var b2 = new B(); // no error
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
index e7e6228392c89..97464233027b9 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
@@ -26,13 +26,13 @@ var M;
         function C1() {
         }
         return C1;
-    })();
+    }());
     M.C1 = C1;
     var C2 = (function () {
         function C2() {
         }
         return C2;
-    })();
+    }());
     M.C2 = C2;
 })(M || (M = {}));
 var N;
@@ -43,7 +43,7 @@ var N;
             _super.apply(this, arguments);
         }
         return D1;
-    })(M.C1);
+    }(M.C1));
     N.D1 = D1;
     var D2 = (function (_super) {
         __extends(D2, _super);
@@ -51,7 +51,7 @@ var N;
             _super.apply(this, arguments);
         }
         return D2;
-    })(M.C2);
+    }(M.C2));
     N.D2 = D2;
 })(N || (N = {}));
 var c = new M.C2(); // no error
diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
index 32f1d20eda193..49145b010d4ba 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
@@ -36,7 +36,7 @@ var a = (function () {
         configurable: true
     });
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -52,4 +52,4 @@ var b = (function (_super) {
         configurable: true
     });
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
index 7a1a86ced18c4..4a202b7649792 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
@@ -27,7 +27,7 @@ var a = (function () {
         return "20";
     };
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -43,4 +43,4 @@ var b = (function (_super) {
         configurable: true
     });
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
index 8a142d41c57fd..a0dd1177cfb45 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
@@ -22,7 +22,7 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -38,4 +38,4 @@ var b = (function (_super) {
         configurable: true
     });
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
index 7c08ec7649e62..06f907371ea1b 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
@@ -33,7 +33,7 @@ var a = (function () {
         configurable: true
     });
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -43,4 +43,4 @@ var b = (function (_super) {
         return "20";
     };
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
index acde620c1004d..ea36c40480f0b 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
@@ -28,7 +28,7 @@ var a = (function () {
         configurable: true
     });
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -38,4 +38,4 @@ var b = (function (_super) {
         return "20";
     };
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
index abd4d7c149802..ae523d53d9bcf 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
@@ -24,7 +24,7 @@ var a = (function () {
         return "10";
     };
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -34,4 +34,4 @@ var b = (function (_super) {
         return "20";
     };
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js b/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
index c2d095e5527a2..93890bd829457 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
@@ -19,7 +19,7 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -29,4 +29,4 @@ var b = (function (_super) {
         return "20";
     };
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
index 979f0c36359ba..4d0f2438459d2 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
@@ -19,7 +19,7 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -29,4 +29,4 @@ var b = (function (_super) {
         return "20";
     };
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
index 5c6c0e06a6f7b..f2dfda4e48ffa 100644
--- a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
@@ -19,7 +19,7 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
@@ -29,4 +29,4 @@ var b = (function (_super) {
         return new b().x;
     };
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticMembersCompatible.js b/tests/baselines/reference/inheritanceStaticMembersCompatible.js
index 014d3276189e2..0dc736a375d7a 100644
--- a/tests/baselines/reference/inheritanceStaticMembersCompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersCompatible.js
@@ -17,11 +17,11 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticMembersIncompatible.js b/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
index a1728dc6dcb11..51c474430ad1f 100644
--- a/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
@@ -17,11 +17,11 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
index fa9c6e2a8b531..d138ac3eba8f7 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
@@ -32,11 +32,11 @@ var a = (function () {
         configurable: true
     });
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js b/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
index 9afa969af65b4..3d3f550713ebc 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
@@ -22,11 +22,11 @@ var a = (function () {
         return "20";
     };
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js b/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
index fcecca6277410..e23917e40a411 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
@@ -17,11 +17,11 @@ var a = (function () {
     function a() {
     }
     return a;
-})();
+}());
 var b = (function (_super) {
     __extends(b, _super);
     function b() {
         _super.apply(this, arguments);
     }
     return b;
-})(a);
+}(a));
diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams.js b/tests/baselines/reference/inheritedConstructorWithRestParams.js
index a0bb2ed8dc16e..2d312d9859daa 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams.js
@@ -28,14 +28,14 @@ var Base = (function () {
         }
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 // Ok
 new Derived("", "");
 new Derived("");
diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams2.js b/tests/baselines/reference/inheritedConstructorWithRestParams2.js
index 9b87465233c7d..0ad25b302f059 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams2.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams2.js
@@ -44,26 +44,26 @@ var IBaseBase = (function () {
     function IBaseBase(x) {
     }
     return IBaseBase;
-})();
+}());
 var BaseBase2 = (function () {
     function BaseBase2(x) {
     }
     return BaseBase2;
-})();
+}());
 var Base = (function (_super) {
     __extends(Base, _super);
     function Base() {
         _super.apply(this, arguments);
     }
     return Base;
-})(BaseBase);
+}(BaseBase));
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 // Ok
 new Derived("", "");
 new Derived("", 3);
diff --git a/tests/baselines/reference/inheritedModuleMembersForClodule.js b/tests/baselines/reference/inheritedModuleMembersForClodule.js
index 50f41af2c09fc..95b71069584ce 100644
--- a/tests/baselines/reference/inheritedModuleMembersForClodule.js
+++ b/tests/baselines/reference/inheritedModuleMembersForClodule.js
@@ -34,14 +34,14 @@ var C = (function () {
         return "123";
     };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 var D;
 (function (D) {
     function foo() {
@@ -59,4 +59,4 @@ var E = (function (_super) {
         return this.foo();
     };
     return E;
-})(D);
+}(D));
diff --git a/tests/baselines/reference/initializerReferencingConstructorLocals.js b/tests/baselines/reference/initializerReferencingConstructorLocals.js
index f382b5b7010a3..a4922e954d7a6 100644
--- a/tests/baselines/reference/initializerReferencingConstructorLocals.js
+++ b/tests/baselines/reference/initializerReferencingConstructorLocals.js
@@ -31,7 +31,7 @@ var C = (function () {
         z = 1;
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x) {
         this.a = z; // error
@@ -40,4 +40,4 @@ var D = (function () {
         z = 1;
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/initializerReferencingConstructorParameters.js b/tests/baselines/reference/initializerReferencingConstructorParameters.js
index 8314d5b715512..881913d5b5f8d 100644
--- a/tests/baselines/reference/initializerReferencingConstructorParameters.js
+++ b/tests/baselines/reference/initializerReferencingConstructorParameters.js
@@ -32,14 +32,14 @@ var C = (function () {
         this.a = x; // error
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x) {
         this.x = x;
         this.a = x; // error
     }
     return D;
-})();
+}());
 var E = (function () {
     function E(x) {
         this.x = x;
@@ -47,7 +47,7 @@ var E = (function () {
         this.b = this.x; // error
     }
     return E;
-})();
+}());
 var F = (function () {
     function F(x) {
         this.x = x;
@@ -55,4 +55,4 @@ var F = (function () {
         this.b = x; // error
     }
     return F;
-})();
+}());
diff --git a/tests/baselines/reference/innerAliases.js b/tests/baselines/reference/innerAliases.js
index 95a3712ca8563..cda2be1c5a913 100644
--- a/tests/baselines/reference/innerAliases.js
+++ b/tests/baselines/reference/innerAliases.js
@@ -34,7 +34,7 @@ var A;
                 function Class1() {
                 }
                 return Class1;
-            })();
+            }());
             C.Class1 = Class1;
         })(C = B.C || (B.C = {}));
     })(B = A.B || (A.B = {}));
@@ -49,7 +49,7 @@ var D;
             function Class2() {
             }
             return Class2;
-        })();
+        }());
         E.Class2 = Class2;
     })(E = D.E || (D.E = {}));
 })(D || (D = {}));
diff --git a/tests/baselines/reference/innerAliases2.js b/tests/baselines/reference/innerAliases2.js
index 846e85504f26b..6ac0a57a484ca 100644
--- a/tests/baselines/reference/innerAliases2.js
+++ b/tests/baselines/reference/innerAliases2.js
@@ -28,7 +28,7 @@ var _provider;
         UsefulClass.prototype.foo = function () {
         };
         return UsefulClass;
-    })();
+    }());
     _provider.UsefulClass = UsefulClass;
 })(_provider || (_provider = {}));
 var consumer;
diff --git a/tests/baselines/reference/innerBoundLambdaEmit.js b/tests/baselines/reference/innerBoundLambdaEmit.js
index c09cc8e5a660d..fe3981cd335d1 100644
--- a/tests/baselines/reference/innerBoundLambdaEmit.js
+++ b/tests/baselines/reference/innerBoundLambdaEmit.js
@@ -16,7 +16,7 @@ var M;
         function Foo() {
         }
         return Foo;
-    })();
+    }());
     M.Foo = Foo;
     var bar = function () { };
 })(M || (M = {}));
diff --git a/tests/baselines/reference/innerExtern.js b/tests/baselines/reference/innerExtern.js
index 5b933f980f4c8..11f526c8310f5 100644
--- a/tests/baselines/reference/innerExtern.js
+++ b/tests/baselines/reference/innerExtern.js
@@ -23,7 +23,7 @@ var A;
                 this.x = BB.Elephant.X;
             }
             return C;
-        })();
+        }());
         B.C = C;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js b/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js
index 36a250d365d95..02b0ccfb382a4 100644
--- a/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js
+++ b/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js
@@ -52,7 +52,7 @@ var C = (function () {
         x.getDate();
     };
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
@@ -65,7 +65,7 @@ var C2 = (function () {
         x.getDate();
     };
     return C2;
-})();
+}());
 //class C2<T extends Date, U extends T> {
 //    g<T extends Number, U extends T>() {
 //        var x: U;
diff --git a/tests/baselines/reference/instanceAndStaticDeclarations1.js b/tests/baselines/reference/instanceAndStaticDeclarations1.js
index 7dbd6dcbe7db7..093e9c15cc8ea 100644
--- a/tests/baselines/reference/instanceAndStaticDeclarations1.js
+++ b/tests/baselines/reference/instanceAndStaticDeclarations1.js
@@ -27,4 +27,4 @@ var Point = (function () {
     Point.distance = function (p1, p2) { return p1.distance(p2); };
     Point.origin = new Point(0, 0);
     return Point;
-})();
+}());
diff --git a/tests/baselines/reference/instanceMemberAssignsToClassPrototype.js b/tests/baselines/reference/instanceMemberAssignsToClassPrototype.js
index 51c38282a72c5..d6dc08f38507a 100644
--- a/tests/baselines/reference/instanceMemberAssignsToClassPrototype.js
+++ b/tests/baselines/reference/instanceMemberAssignsToClassPrototype.js
@@ -26,4 +26,4 @@ var C = (function () {
         return 1;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/instanceMemberInitialization.js b/tests/baselines/reference/instanceMemberInitialization.js
index b62ac68bf52d3..dd9a0fc3b6f8f 100644
--- a/tests/baselines/reference/instanceMemberInitialization.js
+++ b/tests/baselines/reference/instanceMemberInitialization.js
@@ -14,7 +14,7 @@ var C = (function () {
         this.x = 1;
     }
     return C;
-})();
+}());
 var c = new C();
 c.x = 3;
 var c2 = new C();
diff --git a/tests/baselines/reference/instanceOfAssignability.js b/tests/baselines/reference/instanceOfAssignability.js
index 4a1e8b9e9ded8..775afe869461b 100644
--- a/tests/baselines/reference/instanceOfAssignability.js
+++ b/tests/baselines/reference/instanceOfAssignability.js
@@ -100,32 +100,32 @@ var Derived1 = (function () {
     function Derived1() {
     }
     return Derived1;
-})();
+}());
 // Derived2 is a subtype of Base that is not assignable to Derived1
 var Derived2 = (function () {
     function Derived2() {
     }
     return Derived2;
-})();
+}());
 var Animal = (function () {
     function Animal() {
     }
     return Animal;
-})();
+}());
 var Mammal = (function (_super) {
     __extends(Mammal, _super);
     function Mammal() {
         _super.apply(this, arguments);
     }
     return Mammal;
-})(Animal);
+}(Animal));
 var Giraffe = (function (_super) {
     __extends(Giraffe, _super);
     function Giraffe() {
         _super.apply(this, arguments);
     }
     return Giraffe;
-})(Mammal);
+}(Mammal));
 function fn1(x) {
     if (x instanceof Array) {
         // 1.5: y: Array<number>|Array<string>
@@ -179,7 +179,7 @@ var ABC = (function () {
     function ABC() {
     }
     return ABC;
-})();
+}());
 function fn8(x) {
     if (x instanceof ABC) {
         var y = x;
diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js
index 02c0eb0eea49a..540549aef5235 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.js
+++ b/tests/baselines/reference/instanceOfInExternalModules.js
@@ -18,7 +18,7 @@ define(["require", "exports"], function (require, exports) {
         function Foo() {
         }
         return Foo;
-    })();
+    }());
     exports.Foo = Foo;
 });
 //// [instanceOfInExternalModules_1.js]
diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
index 548cb77b87845..a507a19a456ee 100644
--- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
+++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
@@ -65,14 +65,14 @@ var NonGeneric;
         });
         C.prototype.fn = function () { return this; };
         return C;
-    })();
+    }());
     var D = (function (_super) {
         __extends(D, _super);
         function D() {
             _super.apply(this, arguments);
         }
         return D;
-    })(C);
+    }(C));
     var d = new D(1, 2);
     var r = d.fn();
     var r2 = r.x;
@@ -97,14 +97,14 @@ var Generic;
         });
         C.prototype.fn = function () { return this; };
         return C;
-    })();
+    }());
     var D = (function (_super) {
         __extends(D, _super);
         function D() {
             _super.apply(this, arguments);
         }
         return D;
-    })(C);
+    }(C));
     var d = new D(1, '');
     var r = d.fn();
     var r2 = r.x;
diff --git a/tests/baselines/reference/instancePropertyInClassType.js b/tests/baselines/reference/instancePropertyInClassType.js
index 863f18de323c9..ee447aa52332a 100644
--- a/tests/baselines/reference/instancePropertyInClassType.js
+++ b/tests/baselines/reference/instancePropertyInClassType.js
@@ -56,7 +56,7 @@ var NonGeneric;
         });
         C.prototype.fn = function () { return this; };
         return C;
-    })();
+    }());
     var c = new C(1, 2);
     var r = c.fn();
     var r2 = r.x;
@@ -81,7 +81,7 @@ var Generic;
         });
         C.prototype.fn = function () { return this; };
         return C;
-    })();
+    }());
     var c = new C(1, '');
     var r = c.fn();
     var r2 = r.x;
diff --git a/tests/baselines/reference/instanceSubtypeCheck2.js b/tests/baselines/reference/instanceSubtypeCheck2.js
index 59043b29b4ec6..d72f29e93bf0d 100644
--- a/tests/baselines/reference/instanceSubtypeCheck2.js
+++ b/tests/baselines/reference/instanceSubtypeCheck2.js
@@ -17,11 +17,11 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(C1);
+}(C1));
diff --git a/tests/baselines/reference/instanceofOperator.js b/tests/baselines/reference/instanceofOperator.js
index 3c6970b66a4f1..55e3d448b3bfd 100644
--- a/tests/baselines/reference/instanceofOperator.js
+++ b/tests/baselines/reference/instanceofOperator.js
@@ -35,7 +35,7 @@ var test;
         function Object() {
         }
         return Object;
-    })();
+    }());
     var obj;
     4 instanceof null;
     // Error and should be error
diff --git a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js
index 9f83181a146e7..90badcf8e9215 100644
--- a/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js
+++ b/tests/baselines/reference/instanceofOperatorWithInvalidOperands.js
@@ -52,7 +52,7 @@ var C = (function () {
     }
     C.prototype.foo = function () { };
     return C;
-})();
+}());
 var x;
 // invalid left operand
 // the left operand is required to be of type Any, an object type, or a type parameter type
diff --git a/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js b/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js
index c687027ae9bec..e7f35c8da4c23 100644
--- a/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js
+++ b/tests/baselines/reference/instanceofOperatorWithLHSIsObject.js
@@ -20,7 +20,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var x1;
 var x2;
 var a;
diff --git a/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.js b/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.js
index 0602aec2dc1b7..f8b4f680f0f25 100644
--- a/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.js
+++ b/tests/baselines/reference/instantiateGenericClassWithWrongNumberOfTypeArguments.js
@@ -23,12 +23,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = new C();
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 // BUG 794238
 var d = new D();
diff --git a/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.js b/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.js
index 4ded030922a08..2e7e3f87d1b83 100644
--- a/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.js
+++ b/tests/baselines/reference/instantiateGenericClassWithZeroTypeArguments.js
@@ -21,11 +21,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = new C();
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var d = new D();
diff --git a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js
index 3d7d2a7d0174c..4c750024e43bb 100644
--- a/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js
+++ b/tests/baselines/reference/instantiateNonGenericTypeWithTypeArguments.js
@@ -25,7 +25,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = new C();
 function Foo() { }
 var r = new Foo();
diff --git a/tests/baselines/reference/instantiatedBaseTypeConstraints.js b/tests/baselines/reference/instantiatedBaseTypeConstraints.js
index 24e8e66310c4c..c333ed36e1fdf 100644
--- a/tests/baselines/reference/instantiatedBaseTypeConstraints.js
+++ b/tests/baselines/reference/instantiatedBaseTypeConstraints.js
@@ -18,4 +18,4 @@ var Bar = (function () {
     Bar.prototype.foo = function (bar) {
     };
     return Bar;
-})();
+}());
diff --git a/tests/baselines/reference/instantiatedModule.js b/tests/baselines/reference/instantiatedModule.js
index 8cabdeabe49da..d8ef427619ab1 100644
--- a/tests/baselines/reference/instantiatedModule.js
+++ b/tests/baselines/reference/instantiatedModule.js
@@ -85,7 +85,7 @@ var M2;
             return { x: 0, y: 0 };
         };
         return Point;
-    })();
+    }());
     M2.Point = Point;
 })(M2 || (M2 = {}));
 var m2;
diff --git a/tests/baselines/reference/instantiatedReturnTypeContravariance.js b/tests/baselines/reference/instantiatedReturnTypeContravariance.js
index 2484816fe3313..4d5e437630809 100644
--- a/tests/baselines/reference/instantiatedReturnTypeContravariance.js
+++ b/tests/baselines/reference/instantiatedReturnTypeContravariance.js
@@ -43,7 +43,7 @@ var c = (function () {
         return null;
     };
     return c;
-})();
+}());
 var d = (function (_super) {
     __extends(d, _super);
     function d() {
@@ -53,4 +53,4 @@ var d = (function (_super) {
         return null;
     };
     return d;
-})(c);
+}(c));
diff --git a/tests/baselines/reference/intTypeCheck.js b/tests/baselines/reference/intTypeCheck.js
index fbbe1bb5d030a..84eb19ac27d88 100644
--- a/tests/baselines/reference/intTypeCheck.js
+++ b/tests/baselines/reference/intTypeCheck.js
@@ -211,7 +211,7 @@ var Base = (function () {
     }
     Base.prototype.foo = function () { };
     return Base;
-})();
+}());
 var anyVar;
 //
 // Property signatures
diff --git a/tests/baselines/reference/interfaceClassMerging.js b/tests/baselines/reference/interfaceClassMerging.js
index 565884e95efe9..8138e7888b344 100644
--- a/tests/baselines/reference/interfaceClassMerging.js
+++ b/tests/baselines/reference/interfaceClassMerging.js
@@ -53,7 +53,7 @@ var Foo = (function () {
         return this.method(0);
     };
     return Foo;
-})();
+}());
 var Bar = (function (_super) {
     __extends(Bar, _super);
     function Bar() {
@@ -63,7 +63,7 @@ var Bar = (function (_super) {
         return this.optionalProperty;
     };
     return Bar;
-})(Foo);
+}(Foo));
 var bar = new Bar();
 bar.method(0);
 bar.optionalMethod(1);
diff --git a/tests/baselines/reference/interfaceClassMerging2.js b/tests/baselines/reference/interfaceClassMerging2.js
index 0b40067640ce3..99f5b07696d57 100644
--- a/tests/baselines/reference/interfaceClassMerging2.js
+++ b/tests/baselines/reference/interfaceClassMerging2.js
@@ -49,7 +49,7 @@ var Foo = (function () {
         return this;
     };
     return Foo;
-})();
+}());
 var Bar = (function (_super) {
     __extends(Bar, _super);
     function Bar() {
@@ -59,7 +59,7 @@ var Bar = (function (_super) {
         return this;
     };
     return Bar;
-})(Foo);
+}(Foo));
 var bar = new Bar();
 bar.interfaceBarMethod().interfaceFooMethod().classBarMethod().classFooMethod();
 var foo = new Foo();
diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js
index a0012121c0d3a..653579c81eb85 100644
--- a/tests/baselines/reference/interfaceContextualType.js
+++ b/tests/baselines/reference/interfaceContextualType.js
@@ -36,4 +36,4 @@ var Bug = (function () {
         };
     };
     return Bug;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceDeclaration1.js b/tests/baselines/reference/interfaceDeclaration1.js
index a7ec1249a256b..91c84fbbc81b0 100644
--- a/tests/baselines/reference/interfaceDeclaration1.js
+++ b/tests/baselines/reference/interfaceDeclaration1.js
@@ -61,4 +61,4 @@ var C1 = (function () {
         var prototype = 3;
     }
     return C1;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceDeclaration2.js b/tests/baselines/reference/interfaceDeclaration2.js
index 30f9df0fac717..bdd061448be82 100644
--- a/tests/baselines/reference/interfaceDeclaration2.js
+++ b/tests/baselines/reference/interfaceDeclaration2.js
@@ -18,6 +18,6 @@ var I2 = (function () {
     function I2() {
     }
     return I2;
-})();
+}());
 function I3() { }
 var I4;
diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js
index c3cbf47771d5d..a4df8926fbae3 100644
--- a/tests/baselines/reference/interfaceDeclaration3.js
+++ b/tests/baselines/reference/interfaceDeclaration3.js
@@ -64,27 +64,27 @@ define(["require", "exports"], function (require, exports) {
             function C1() {
             }
             return C1;
-        })();
+        }());
         var C2 = (function () {
             function C2() {
             }
             return C2;
-        })();
+        }());
         var C3 = (function () {
             function C3() {
             }
             return C3;
-        })();
+        }());
         var C4 = (function () {
             function C4() {
             }
             return C4;
-        })();
+        }());
         var C5 = (function () {
             function C5() {
             }
             return C5;
-        })();
+        }());
     })(M1 || (M1 = {}));
     var M2;
     (function (M2) {
@@ -92,31 +92,31 @@ define(["require", "exports"], function (require, exports) {
             function C1() {
             }
             return C1;
-        })();
+        }());
         var C2 = (function () {
             function C2() {
             }
             return C2;
-        })();
+        }());
         var C3 = (function () {
             function C3() {
             }
             return C3;
-        })();
+        }());
     })(M2 = exports.M2 || (exports.M2 = {}));
     var C1 = (function () {
         function C1() {
         }
         return C1;
-    })();
+    }());
     var C2 = (function () {
         function C2() {
         }
         return C2;
-    })();
+    }());
     var C3 = (function () {
         function C3() {
         }
         return C3;
-    })();
+    }());
 });
diff --git a/tests/baselines/reference/interfaceDeclaration4.js b/tests/baselines/reference/interfaceDeclaration4.js
index 728ef7156e9d6..cf97cf66972e5 100644
--- a/tests/baselines/reference/interfaceDeclaration4.js
+++ b/tests/baselines/reference/interfaceDeclaration4.js
@@ -49,24 +49,24 @@ var Foo;
         function C1() {
         }
         return C1;
-    })();
+    }());
     Foo.C1 = C1;
 })(Foo || (Foo = {}));
 var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 // Err - not implemented item
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 I1;
 { }
diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js
index 6a643e4b066b2..6726971d208bb 100644
--- a/tests/baselines/reference/interfaceDeclaration5.js
+++ b/tests/baselines/reference/interfaceDeclaration5.js
@@ -10,6 +10,6 @@ define(["require", "exports"], function (require, exports) {
         function C1() {
         }
         return C1;
-    })();
+    }());
     exports.C1 = C1;
 });
diff --git a/tests/baselines/reference/interfaceExtendingClass.js b/tests/baselines/reference/interfaceExtendingClass.js
index f1232d7824558..e2ca3f89791c2 100644
--- a/tests/baselines/reference/interfaceExtendingClass.js
+++ b/tests/baselines/reference/interfaceExtendingClass.js
@@ -32,7 +32,7 @@ var Foo = (function () {
         configurable: true
     });
     return Foo;
-})();
+}());
 var i;
 var r1 = i.x;
 var r2 = i.y();
diff --git a/tests/baselines/reference/interfaceExtendingClass2.js b/tests/baselines/reference/interfaceExtendingClass2.js
index c4143659125c7..c04ecf1d1bbec 100644
--- a/tests/baselines/reference/interfaceExtendingClass2.js
+++ b/tests/baselines/reference/interfaceExtendingClass2.js
@@ -29,6 +29,6 @@ var Foo = (function () {
         configurable: true
     });
     return Foo;
-})();
+}());
 return 1;
 ;
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates.js b/tests/baselines/reference/interfaceExtendingClassWithPrivates.js
index 3634d088a98ff..576f1a101280b 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates.js
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates.js
@@ -20,7 +20,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var i;
 var r = i.y;
 var r2 = i.x; // error
diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js
index 6726d560a8c53..a6f966a8fac51 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js
+++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js
@@ -32,17 +32,17 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var Baz = (function () {
     function Baz() {
     }
     return Baz;
-})();
+}());
 var i;
 var r = i.z;
 var r2 = i.x; // error
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js
index f2d95812fd2a6..18c145ab72ec6 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds.js
@@ -20,7 +20,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var i;
 var r = i.y;
 var r2 = i.x; // error
diff --git a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js
index 277c32a10c154..6bf6b22120bf2 100644
--- a/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js
+++ b/tests/baselines/reference/interfaceExtendingClassWithProtecteds2.js
@@ -32,17 +32,17 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 var Baz = (function () {
     function Baz() {
     }
     return Baz;
-})();
+}());
 var i;
 var r = i.z;
 var r2 = i.x; // error
diff --git a/tests/baselines/reference/interfaceExtendsClass1.js b/tests/baselines/reference/interfaceExtendsClass1.js
index 2fbe01bdf67dc..43c7c6f6fa473 100644
--- a/tests/baselines/reference/interfaceExtendsClass1.js
+++ b/tests/baselines/reference/interfaceExtendsClass1.js
@@ -28,7 +28,7 @@ var Control = (function () {
     function Control() {
     }
     return Control;
-})();
+}());
 var Button = (function (_super) {
     __extends(Button, _super);
     function Button() {
@@ -36,7 +36,7 @@ var Button = (function (_super) {
     }
     Button.prototype.select = function () { };
     return Button;
-})(Control);
+}(Control));
 var TextBox = (function (_super) {
     __extends(TextBox, _super);
     function TextBox() {
@@ -44,17 +44,17 @@ var TextBox = (function (_super) {
     }
     TextBox.prototype.select = function () { };
     return TextBox;
-})(Control);
+}(Control));
 var Image = (function (_super) {
     __extends(Image, _super);
     function Image() {
         _super.apply(this, arguments);
     }
     return Image;
-})(Control);
+}(Control));
 var Location = (function () {
     function Location() {
     }
     Location.prototype.select = function () { };
     return Location;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
index 9a6e92c3e2b4c..e1bdbff85dd9d 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
@@ -39,7 +39,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { return x; };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -49,7 +49,7 @@ var D = (function (_super) {
     D.prototype.other = function (x) { return x; };
     D.prototype.bar = function () { };
     return D;
-})(C);
+}(C));
 var c;
 var i;
 var d;
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
index 44738036f9652..1592b1a723b54 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
@@ -35,7 +35,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { return x; };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -47,7 +47,7 @@ var D = (function (_super) {
     D.prototype.other = function (x) { return x; };
     D.prototype.bar = function () { };
     return D;
-})(C);
+}(C));
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
@@ -58,4 +58,4 @@ var D2 = (function (_super) {
     D2.prototype.other = function (x) { return x; };
     D2.prototype.bar = function () { };
     return D2;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/interfaceImplementation1.js b/tests/baselines/reference/interfaceImplementation1.js
index 8f02596682d56..6a8d1b2d782cd 100644
--- a/tests/baselines/reference/interfaceImplementation1.js
+++ b/tests/baselines/reference/interfaceImplementation1.js
@@ -52,13 +52,13 @@ var C1 = (function () {
     }
     C1.prototype.iFn = function (n, s) { };
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
         this.x = 1;
     }
     return C2;
-})();
+}());
 var a = function () {
     return new C2();
 };
diff --git a/tests/baselines/reference/interfaceImplementation2.js b/tests/baselines/reference/interfaceImplementation2.js
index ac571a364b573..747fb0a6da3bc 100644
--- a/tests/baselines/reference/interfaceImplementation2.js
+++ b/tests/baselines/reference/interfaceImplementation2.js
@@ -18,4 +18,4 @@ var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceImplementation3.js b/tests/baselines/reference/interfaceImplementation3.js
index da85de545cddc..ef713d517b7d3 100644
--- a/tests/baselines/reference/interfaceImplementation3.js
+++ b/tests/baselines/reference/interfaceImplementation3.js
@@ -21,4 +21,4 @@ var C4 = (function () {
     }
     C4.prototype.iFn = function () { };
     return C4;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceImplementation4.js b/tests/baselines/reference/interfaceImplementation4.js
index 4a093381b5d5f..07d2f85e311cb 100644
--- a/tests/baselines/reference/interfaceImplementation4.js
+++ b/tests/baselines/reference/interfaceImplementation4.js
@@ -19,4 +19,4 @@ var C5 = (function () {
     }
     C5.prototype.iFn = function () { };
     return C5;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceImplementation5.js b/tests/baselines/reference/interfaceImplementation5.js
index c710eda84f577..e2b1ad345a983 100644
--- a/tests/baselines/reference/interfaceImplementation5.js
+++ b/tests/baselines/reference/interfaceImplementation5.js
@@ -41,7 +41,7 @@ var C1 = (function () {
         configurable: true
     });
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
@@ -51,7 +51,7 @@ var C2 = (function () {
         configurable: true
     });
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
@@ -62,7 +62,7 @@ var C3 = (function () {
         configurable: true
     });
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
     }
@@ -72,7 +72,7 @@ var C4 = (function () {
         configurable: true
     });
     return C4;
-})();
+}());
 var C5 = (function () {
     function C5() {
     }
@@ -82,7 +82,7 @@ var C5 = (function () {
         configurable: true
     });
     return C5;
-})();
+}());
 var C6 = (function () {
     function C6() {
     }
@@ -93,4 +93,4 @@ var C6 = (function () {
         configurable: true
     });
     return C6;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js
index e21499a20f470..642300d9160fc 100644
--- a/tests/baselines/reference/interfaceImplementation6.js
+++ b/tests/baselines/reference/interfaceImplementation6.js
@@ -31,23 +31,23 @@ define(["require", "exports"], function (require, exports) {
         function C1() {
         }
         return C1;
-    })();
+    }());
     var C2 = (function () {
         function C2() {
         }
         return C2;
-    })();
+    }());
     var C3 = (function () {
         function C3() {
             var item;
         }
         return C3;
-    })();
+    }());
     var Test = (function () {
         function Test() {
             this.pt = { item: 1 };
         }
         return Test;
-    })();
+    }());
     exports.Test = Test;
 });
diff --git a/tests/baselines/reference/interfaceImplementation7.js b/tests/baselines/reference/interfaceImplementation7.js
index 2813d7ee0fe57..7a1a29c65bfb2 100644
--- a/tests/baselines/reference/interfaceImplementation7.js
+++ b/tests/baselines/reference/interfaceImplementation7.js
@@ -16,4 +16,4 @@ var C1 = (function () {
     }
     C1.prototype.name = function () { return ""; };
     return C1;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceImplementation8.js b/tests/baselines/reference/interfaceImplementation8.js
index cb6eaa1245022..edfb33bfe1b4f 100644
--- a/tests/baselines/reference/interfaceImplementation8.js
+++ b/tests/baselines/reference/interfaceImplementation8.js
@@ -50,47 +50,47 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C4 = (function (_super) {
     __extends(C4, _super);
     function C4() {
         _super.apply(this, arguments);
     }
     return C4;
-})(C1);
+}(C1));
 var C5 = (function (_super) {
     __extends(C5, _super);
     function C5() {
         _super.apply(this, arguments);
     }
     return C5;
-})(C2);
+}(C2));
 var C6 = (function (_super) {
     __extends(C6, _super);
     function C6() {
         _super.apply(this, arguments);
     }
     return C6;
-})(C3);
+}(C3));
 var C7 = (function () {
     function C7() {
     }
     return C7;
-})();
+}());
 var C8 = (function (_super) {
     __extends(C8, _super);
     function C8() {
         _super.apply(this, arguments);
     }
     return C8;
-})(C7);
+}(C7));
diff --git a/tests/baselines/reference/interfaceInReopenedModule.js b/tests/baselines/reference/interfaceInReopenedModule.js
index 1f9d098159043..1196cd4df29a0 100644
--- a/tests/baselines/reference/interfaceInReopenedModule.js
+++ b/tests/baselines/reference/interfaceInReopenedModule.js
@@ -19,6 +19,6 @@ var m;
         function n() {
         }
         return n;
-    })();
+    }());
     m.n = n;
 })(m || (m = {}));
diff --git a/tests/baselines/reference/interfaceInheritance.js b/tests/baselines/reference/interfaceInheritance.js
index beec0f35d86be..85ae7287f4a12 100644
--- a/tests/baselines/reference/interfaceInheritance.js
+++ b/tests/baselines/reference/interfaceInheritance.js
@@ -45,7 +45,7 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var i2;
 var i1;
 var i3;
diff --git a/tests/baselines/reference/interfacePropertiesWithSameName3.js b/tests/baselines/reference/interfacePropertiesWithSameName3.js
index 2711eb4684735..bf4b9edefc1ae 100644
--- a/tests/baselines/reference/interfacePropertiesWithSameName3.js
+++ b/tests/baselines/reference/interfacePropertiesWithSameName3.js
@@ -13,9 +13,9 @@ var D2 = (function () {
     function D2() {
     }
     return D2;
-})();
+}());
 var E2 = (function () {
     function E2() {
     }
     return E2;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceSubtyping.js b/tests/baselines/reference/interfaceSubtyping.js
index 430049857829b..e0552a964e984 100644
--- a/tests/baselines/reference/interfaceSubtyping.js
+++ b/tests/baselines/reference/interfaceSubtyping.js
@@ -16,4 +16,4 @@ var Camera = (function () {
     }
     Camera.prototype.foo = function () { return "s"; };
     return Camera;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceWithMultipleDeclarations.js b/tests/baselines/reference/interfaceWithMultipleDeclarations.js
index f4b4e733161ec..e2ba78877e655 100644
--- a/tests/baselines/reference/interfaceWithMultipleDeclarations.js
+++ b/tests/baselines/reference/interfaceWithMultipleDeclarations.js
@@ -42,4 +42,4 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.js b/tests/baselines/reference/interfaceWithPropertyOfEveryType.js
index 90c0d257d6197..fef3d2457d83e 100644
--- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.js
+++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.js
@@ -47,7 +47,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 function f1() { }
 var M;
 (function (M) {
diff --git a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.js b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.js
index 5209c0e97b9ff..fb5c0bd147af9 100644
--- a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.js
+++ b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType.js
@@ -20,9 +20,9 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
diff --git a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js
index d53ec04c1838b..783a1fe4c8ba6 100644
--- a/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js
+++ b/tests/baselines/reference/interfaceWithPropertyThatIsPrivateInBaseType2.js
@@ -21,10 +21,10 @@ var Base = (function () {
     }
     Base.prototype.x = function () { };
     return Base;
-})();
+}());
 var Base2 = (function () {
     function Base2() {
     }
     Base2.prototype.x = function () { };
     return Base2;
-})();
+}());
diff --git a/tests/baselines/reference/interfacedecl.js b/tests/baselines/reference/interfacedecl.js
index fc1468b2c72da..24d9df256caa2 100644
--- a/tests/baselines/reference/interfacedecl.js
+++ b/tests/baselines/reference/interfacedecl.js
@@ -51,7 +51,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance2 = new c1();
 
 
diff --git a/tests/baselines/reference/interfacedeclWithIndexerErrors.js b/tests/baselines/reference/interfacedeclWithIndexerErrors.js
index 177b392fd2d48..0e979a09d6358 100644
--- a/tests/baselines/reference/interfacedeclWithIndexerErrors.js
+++ b/tests/baselines/reference/interfacedeclWithIndexerErrors.js
@@ -51,5 +51,5 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance2 = new c1();
diff --git a/tests/baselines/reference/internalAliasClass.js b/tests/baselines/reference/internalAliasClass.js
index 6361d7fdf9987..7f3c7b695810c 100644
--- a/tests/baselines/reference/internalAliasClass.js
+++ b/tests/baselines/reference/internalAliasClass.js
@@ -16,7 +16,7 @@ var a;
         function c() {
         }
         return c;
-    })();
+    }());
     a.c = c;
 })(a || (a = {}));
 var c;
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
index 6714c10411eea..aa274838529d0 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
@@ -28,7 +28,7 @@ var x;
             return a;
         };
         return c;
-    })();
+    }());
     x.c = c;
 })(x = exports.x || (exports.x = {}));
 var m2;
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
index 64bfe61fa6a03..03b3542eca4f7 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
@@ -26,7 +26,7 @@ var x;
             return a;
         };
         return c;
-    })();
+    }());
     x.c = c;
 })(x = exports.x || (exports.x = {}));
 var m2;
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
index 49b784a9e99f6..c15ca69e13fcc 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
@@ -28,7 +28,7 @@ var x;
             return a;
         };
         return c;
-    })();
+    }());
     x.c = c;
 })(x = exports.x || (exports.x = {}));
 var m2;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
index 1fa90e62b82f0..f881032fa1eb5 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
@@ -22,7 +22,7 @@ var x;
             return a;
         };
         return c;
-    })();
+    }());
     x.c = c;
 })(x = exports.x || (exports.x = {}));
 exports.xc = x.c;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
index d4e1f3fc8e394..ac5004a7606a1 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
@@ -22,7 +22,7 @@ var x;
             return a;
         };
         return c;
-    })();
+    }());
     x.c = c;
 })(x = exports.x || (exports.x = {}));
 var xc = x.c;
diff --git a/tests/baselines/reference/internalAliasInitializedModule.js b/tests/baselines/reference/internalAliasInitializedModule.js
index d7f741b7228af..1d5e773994e2f 100644
--- a/tests/baselines/reference/internalAliasInitializedModule.js
+++ b/tests/baselines/reference/internalAliasInitializedModule.js
@@ -20,7 +20,7 @@ var a;
             function c() {
             }
             return c;
-        })();
+        }());
         b.c = c;
     })(b = a.b || (a.b = {}));
 })(a || (a = {}));
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
index 0906321df884f..3bd4c7c2fbca1 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
@@ -22,7 +22,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             b.c = c;
         })(b = a.b || (a.b = {}));
     })(a = exports.a || (exports.a = {}));
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
index 212f4f841eb13..910319be5e86f 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
@@ -21,7 +21,7 @@ var a;
             function c() {
             }
             return c;
-        })();
+        }());
         b.c = c;
     })(b = a.b || (a.b = {}));
 })(a = exports.a || (exports.a = {}));
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
index e6a3cd9f93804..02181f04f8d4c 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -23,7 +23,7 @@ var a;
             function c() {
             }
             return c;
-        })();
+        }());
         b.c = c;
     })(b = a.b || (a.b = {}));
 })(a = exports.a || (exports.a = {}));
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
index ea7681a2a503f..26915043496b1 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
@@ -19,7 +19,7 @@ var a;
             function c() {
             }
             return c;
-        })();
+        }());
         b.c = c;
     })(b = a.b || (a.b = {}));
 })(a = exports.a || (exports.a = {}));
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
index 90fd7212794ef..a8a1d9ee0471c 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -20,7 +20,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             b.c = c;
         })(b = a.b || (a.b = {}));
     })(a = exports.a || (exports.a = {}));
diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js
index 28cc2c2b6b404..8feecb53f98bf 100644
--- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js
+++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstance.js
@@ -18,7 +18,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var A;
 (function (A) {
     A.a = 10;
diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js
index 23c4aed97d1d1..27101bba5f958 100644
--- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js
+++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js
@@ -17,7 +17,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var A;
 (function (A) {
     A.a = 10;
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js
index 883819975ef2e..1df5c768f97d2 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstance.js
@@ -17,7 +17,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B;
 (function (B) {
     var A = 1;
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js
index a5357edc78f9c..4706390148f6c 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.js
@@ -16,4 +16,4 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/intrinsics.js b/tests/baselines/reference/intrinsics.js
index 736ffa020fa2b..548c72b1b40f7 100644
--- a/tests/baselines/reference/intrinsics.js
+++ b/tests/baselines/reference/intrinsics.js
@@ -23,7 +23,7 @@ var m1;
         function C() {
         }
         return C;
-    })();
+    }());
 })(m1 || (m1 = {}));
 __proto__ = 0; // Error, __proto__ not defined
 m1.__proto__ = 0;
@@ -31,5 +31,5 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var foo;
diff --git a/tests/baselines/reference/invalidAssignmentsToVoid.js b/tests/baselines/reference/invalidAssignmentsToVoid.js
index 218126d410826..5f3a8ddabfc59 100644
--- a/tests/baselines/reference/invalidAssignmentsToVoid.js
+++ b/tests/baselines/reference/invalidAssignmentsToVoid.js
@@ -32,7 +32,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 x = C;
 x = c;
diff --git a/tests/baselines/reference/invalidBooleanAssignments.js b/tests/baselines/reference/invalidBooleanAssignments.js
index d47787b4bf4fb..48951c77fb14c 100644
--- a/tests/baselines/reference/invalidBooleanAssignments.js
+++ b/tests/baselines/reference/invalidBooleanAssignments.js
@@ -41,7 +41,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var f = x;
 var g = x;
 var h = x;
diff --git a/tests/baselines/reference/invalidImportAliasIdentifiers.js b/tests/baselines/reference/invalidImportAliasIdentifiers.js
index 2b31f5abebde1..312ce2ba3c2a4 100644
--- a/tests/baselines/reference/invalidImportAliasIdentifiers.js
+++ b/tests/baselines/reference/invalidImportAliasIdentifiers.js
@@ -31,7 +31,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var E;
 (function (E) {
     E[E["Red"] = 0] = "Red";
diff --git a/tests/baselines/reference/invalidInstantiatedModule.js b/tests/baselines/reference/invalidInstantiatedModule.js
index 13e46c800ca37..65328dc15b50f 100644
--- a/tests/baselines/reference/invalidInstantiatedModule.js
+++ b/tests/baselines/reference/invalidInstantiatedModule.js
@@ -22,7 +22,7 @@ var M;
         function Point() {
         }
         return Point;
-    })();
+    }());
     M.Point = Point;
     M.Point = 1; // Error
 })(M || (M = {}));
diff --git a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
index 0b662b56f06ee..cb3c22b52eb16 100644
--- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
@@ -91,14 +91,14 @@ var Y;
         function A() {
         }
         return A;
-    })();
+    }());
     var BB = (function (_super) {
         __extends(BB, _super);
         function BB() {
             _super.apply(this, arguments);
         }
         return BB;
-    })(A);
+    }(A));
 })(Y || (Y = {}));
 var Y2;
 (function (Y2) {
@@ -106,14 +106,14 @@ var Y2;
         function AA() {
         }
         return AA;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(AA);
+    }(AA));
 })(Y2 || (Y2 = {}));
 var Y3;
 (function (Y3) {
@@ -123,7 +123,7 @@ var Y3;
             function A() {
             }
             return A;
-        })();
+        }());
     })(Module || (Module = {}));
 })(Y3 || (Y3 = {}));
 var Y4;
@@ -140,14 +140,14 @@ var YY;
         function A() {
         }
         return A;
-    })();
+    }());
     var BB = (function (_super) {
         __extends(BB, _super);
         function BB() {
             _super.apply(this, arguments);
         }
         return BB;
-    })(A);
+    }(A));
 })(YY || (YY = {}));
 var YY2;
 (function (YY2) {
@@ -155,14 +155,14 @@ var YY2;
         function AA() {
         }
         return AA;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(AA);
+    }(AA));
 })(YY2 || (YY2 = {}));
 var YY3;
 (function (YY3) {
@@ -172,7 +172,7 @@ var YY3;
             function A() {
             }
             return A;
-        })();
+        }());
     })(Module || (Module = {}));
 })(YY3 || (YY3 = {}));
 var YY4;
@@ -189,14 +189,14 @@ var YYY;
         function A() {
         }
         return A;
-    })();
+    }());
     var BB = (function (_super) {
         __extends(BB, _super);
         function BB() {
             _super.apply(this, arguments);
         }
         return BB;
-    })(A);
+    }(A));
 })(YYY || (YYY = {}));
 var YYY2;
 (function (YYY2) {
@@ -204,14 +204,14 @@ var YYY2;
         function AA() {
         }
         return AA;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(AA);
+    }(AA));
 })(YYY2 || (YYY2 = {}));
 var YYY3;
 (function (YYY3) {
@@ -221,7 +221,7 @@ var YYY3;
             function A() {
             }
             return A;
-        })();
+        }());
     })(Module || (Module = {}));
 })(YYY3 || (YYY3 = {}));
 var YYY4;
diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.js b/tests/baselines/reference/invalidMultipleVariableDeclarations.js
index b239a3dc1dde0..0c90c6d002598 100644
--- a/tests/baselines/reference/invalidMultipleVariableDeclarations.js
+++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.js
@@ -63,19 +63,19 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(C);
+}(C));
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 function F(x) { return 42; }
 var M;
 (function (M) {
@@ -83,7 +83,7 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     function F2(x) { return x.toString(); }
     M.F2 = F2;
diff --git a/tests/baselines/reference/invalidNestedModules.js b/tests/baselines/reference/invalidNestedModules.js
index bec6491a63696..8b532ddd757d5 100644
--- a/tests/baselines/reference/invalidNestedModules.js
+++ b/tests/baselines/reference/invalidNestedModules.js
@@ -40,7 +40,7 @@ var A;
                 function Point() {
                 }
                 return Point;
-            })();
+            }());
             C.Point = Point;
         })(C = B.C || (B.C = {}));
     })(B = A.B || (A.B = {}));
@@ -53,7 +53,7 @@ var A;
             function C() {
             }
             return C;
-        })();
+        }());
         B.C = C;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
@@ -65,7 +65,7 @@ var M2;
             function Point() {
             }
             return Point;
-        })();
+        }());
         X.Point = Point;
     })(X = M2.X || (M2.X = {}));
 })(M2 || (M2 = {}));
diff --git a/tests/baselines/reference/invalidNumberAssignments.js b/tests/baselines/reference/invalidNumberAssignments.js
index b381f5b050230..674421b3791c8 100644
--- a/tests/baselines/reference/invalidNumberAssignments.js
+++ b/tests/baselines/reference/invalidNumberAssignments.js
@@ -33,7 +33,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var e = x;
 var f = x;
 var g = 1;
diff --git a/tests/baselines/reference/invalidReferenceSyntax1.js b/tests/baselines/reference/invalidReferenceSyntax1.js
index 39ecf8e6ab4f5..e220c41dd6f1f 100644
--- a/tests/baselines/reference/invalidReferenceSyntax1.js
+++ b/tests/baselines/reference/invalidReferenceSyntax1.js
@@ -10,4 +10,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/invalidReturnStatements.js b/tests/baselines/reference/invalidReturnStatements.js
index 5fbe8c4dc3763..0f5b0d3e08dd5 100644
--- a/tests/baselines/reference/invalidReturnStatements.js
+++ b/tests/baselines/reference/invalidReturnStatements.js
@@ -37,13 +37,13 @@ var C = (function () {
     }
     C.prototype.dispose = function () { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 function fn10() { return { id: 12 }; }
 function fn11() { return new C(); }
diff --git a/tests/baselines/reference/invalidStaticField.js b/tests/baselines/reference/invalidStaticField.js
index 620c019fc18e2..dc582e830c7c7 100644
--- a/tests/baselines/reference/invalidStaticField.js
+++ b/tests/baselines/reference/invalidStaticField.js
@@ -8,10 +8,10 @@ var A = (function () {
     }
     A.prototype.foo = function () { return B.NULL; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.NOT_NULL = new B();
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/invalidStringAssignments.js b/tests/baselines/reference/invalidStringAssignments.js
index 1f746f53e005a..ec0d228ed0455 100644
--- a/tests/baselines/reference/invalidStringAssignments.js
+++ b/tests/baselines/reference/invalidStringAssignments.js
@@ -36,7 +36,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var e = x;
 var f = x;
 var g = 1;
diff --git a/tests/baselines/reference/invalidTypeNames.js b/tests/baselines/reference/invalidTypeNames.js
index ddae3e4eeb937..bdb755ac6cb7d 100644
--- a/tests/baselines/reference/invalidTypeNames.js
+++ b/tests/baselines/reference/invalidTypeNames.js
@@ -10,4 +10,4 @@ var illegal_name_here = (function () {
     function illegal_name_here() {
     }
     return illegal_name_here;
-})();
+}());
diff --git a/tests/baselines/reference/invalidUndefinedAssignments.js b/tests/baselines/reference/invalidUndefinedAssignments.js
index dc846900ebb39..004c641466cb6 100644
--- a/tests/baselines/reference/invalidUndefinedAssignments.js
+++ b/tests/baselines/reference/invalidUndefinedAssignments.js
@@ -33,7 +33,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var f;
 C = x;
 var g;
diff --git a/tests/baselines/reference/invalidUndefinedValues.js b/tests/baselines/reference/invalidUndefinedValues.js
index a0ed1b4f98a9c..04a8eed665539 100644
--- a/tests/baselines/reference/invalidUndefinedValues.js
+++ b/tests/baselines/reference/invalidUndefinedValues.js
@@ -43,7 +43,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var b;
 x = C;
 x = b;
diff --git a/tests/baselines/reference/invalidVoidAssignments.js b/tests/baselines/reference/invalidVoidAssignments.js
index 1ce03d1382acc..79fd7fe5eacd8 100644
--- a/tests/baselines/reference/invalidVoidAssignments.js
+++ b/tests/baselines/reference/invalidVoidAssignments.js
@@ -39,7 +39,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var e = x;
 var f = x;
 var g = 1;
diff --git a/tests/baselines/reference/invalidVoidValues.js b/tests/baselines/reference/invalidVoidValues.js
index 409df03ef373d..7844c54f7b6e5 100644
--- a/tests/baselines/reference/invalidVoidValues.js
+++ b/tests/baselines/reference/invalidVoidValues.js
@@ -41,7 +41,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 x = a;
 var b;
diff --git a/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments1.js b/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments1.js
index 5ac4976398cef..01884ae2b0828 100644
--- a/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments1.js
+++ b/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments1.js
@@ -12,4 +12,4 @@ var Foo = (function () {
         this.foo();
     }
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments2.js b/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments2.js
index 26719b80c810c..96a9ec98d664d 100644
--- a/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments2.js
+++ b/tests/baselines/reference/invokingNonGenericMethodWithTypeArguments2.js
@@ -14,4 +14,4 @@ var Foo = (function () {
         this.foo();
     }
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js
index 8604ec493a2ab..99e1ac72acd25 100644
--- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.js
+++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.js
@@ -153,7 +153,7 @@ var schema;
             configurable: true
         });
         return T;
-    })();
+    }());
     schema.T = T;
 })(schema || (schema = {}));
 
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index f5dcb65bc9a8f..2d391a64fe72b 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -29,7 +29,7 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(module_2.c2.C);
+}(module_2.c2.C));
 var x = new module_1.c();
 var y = ns.value;
 var module_3 = require("module");
diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js
index 836b39380eafb..32b10dafad30c 100644
--- a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js
+++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js
@@ -15,4 +15,4 @@ var c = (function () {
         var x = function (a) { return _this.method(a); };
     };
     return c;
-})();
+}());
diff --git a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js
index ea9c9f62b8d64..e1052c14bbcb9 100644
--- a/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js
+++ b/tests/baselines/reference/jsFileCompilationEmitBlockedCorrectly.js
@@ -20,4 +20,4 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js
index d45ae325b0a76..5ed349ded428e 100644
--- a/tests/baselines/reference/jsFileCompilationEmitDeclarations.js
+++ b/tests/baselines/reference/jsFileCompilationEmitDeclarations.js
@@ -14,7 +14,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 function foo() {
 }
 
diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js
index 2d7d2743805ec..73fd2aab6e110 100644
--- a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js
+++ b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.js
@@ -18,7 +18,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 function bar() {
 }
 /// <reference path="c.js"/>
diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js
index cf2caab36003a..22ca88de330b6 100644
--- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js
+++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithNoOut.js
@@ -19,7 +19,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 //// [b.js]
 /// <reference path="c.js"/>
 // b.d.ts should have c.js as the reference path since we dont emit declarations for js files
diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js
index 67989f3e3e7da..ba7eacd905b94 100644
--- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js
+++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.js
@@ -19,7 +19,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 function bar() {
 }
 /// <reference path="c.js"/>
diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js
index afed8cd42e34e..5856e12414819 100644
--- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js
+++ b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOutDir.js
@@ -19,7 +19,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 //// [c.js]
 function bar() {
 }
diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js
index 2d84420798686..43831985e2ae6 100644
--- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js
+++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithNoOut.js
@@ -19,7 +19,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 //// [b.js]
 /// <reference path="c.js"/>
 // no error on above reference path since not emitting declarations
diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js
index fae4936b6c916..f60aefd9ae4bd 100644
--- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js
+++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js
@@ -19,7 +19,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 function bar() {
 }
 /// <reference path="c.js"/>
diff --git a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js
index a7ba8b49985a9..cc41c5b414084 100644
--- a/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js
+++ b/tests/baselines/reference/jsFileCompilationWithDeclarationEmitPathSameAsInput.js
@@ -12,4 +12,4 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js
index a5351de087c7d..8e70b464c2fd5 100644
--- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js
+++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js
@@ -18,5 +18,5 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 //# sourceMappingURL=a.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt
index db0f57e590959..d8c66a888b38d 100644
--- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt
+++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt
@@ -39,7 +39,7 @@ sourceFile:a.ts
 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0)
 2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js
index e0395e553c56e..c23d44b9cb810 100644
--- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js
+++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js
@@ -18,5 +18,5 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0E7SUFBQTtJQUNBLENBQUM7SUFBRCxRQUFDO0FBQUQsQ0FBQyxBQURELElBQ0MifQ==
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt
index 41b2ac54f0ace..c7cb8afe69678 100644
--- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt
+++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt
@@ -39,7 +39,7 @@ sourceFile:a.ts
 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0)
 2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js
index 742e7af2799b6..b6c7efa947861 100644
--- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js
+++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js
@@ -18,5 +18,5 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 //# sourceMappingURL=a.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt
index 762af7a798aad..5c37dd7540992 100644
--- a/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt
+++ b/tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt
@@ -39,7 +39,7 @@ sourceFile:../tests/cases/compiler/a.ts
 1->Emitted(4, 5) Source(3, 1) + SourceIndex(0)
 2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/jsFileCompilationWithOut.js b/tests/baselines/reference/jsFileCompilationWithOut.js
index 32d0261061f6f..0ee9f08ebd4b9 100644
--- a/tests/baselines/reference/jsFileCompilationWithOut.js
+++ b/tests/baselines/reference/jsFileCompilationWithOut.js
@@ -14,6 +14,6 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 function foo() {
 }
diff --git a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js
index d3b2f788d6605..f87ce797d6640 100644
--- a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js
+++ b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.js
@@ -12,4 +12,4 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
diff --git a/tests/baselines/reference/jsFileCompilationWithoutOut.js b/tests/baselines/reference/jsFileCompilationWithoutOut.js
index 4a60c54c3aba3..5bed8b3a8bbcf 100644
--- a/tests/baselines/reference/jsFileCompilationWithoutOut.js
+++ b/tests/baselines/reference/jsFileCompilationWithoutOut.js
@@ -14,4 +14,4 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
diff --git a/tests/baselines/reference/jsxAndTypeAssertion.js b/tests/baselines/reference/jsxAndTypeAssertion.js
index 0a493006dc6ae..f3a1b5ecbff39 100644
--- a/tests/baselines/reference/jsxAndTypeAssertion.js
+++ b/tests/baselines/reference/jsxAndTypeAssertion.js
@@ -27,7 +27,7 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
 var x;
 x = <any> {test} <any></any> };
 
diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js
index c980dc256c625..ba8efc9e7ab4c 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -41,4 +41,4 @@ var TestComponent = (function (_super) {
         return <BaseComponent />;
     };
     return TestComponent;
-})(React.Component);
+}(React.Component));
diff --git a/tests/baselines/reference/lambdaArgCrash.js b/tests/baselines/reference/lambdaArgCrash.js
index 5616b5d525f64..822aa71efd047 100644
--- a/tests/baselines/reference/lambdaArgCrash.js
+++ b/tests/baselines/reference/lambdaArgCrash.js
@@ -52,7 +52,7 @@ var Event = (function () {
         this._listeners.push(listener);
     };
     return Event;
-})();
+}());
 var ItemSetEvent = (function (_super) {
     __extends(ItemSetEvent, _super);
     function ItemSetEvent() {
@@ -62,4 +62,4 @@ var ItemSetEvent = (function (_super) {
         _super.prototype.add.call(this, listener);
     };
     return ItemSetEvent;
-})(Event);
+}(Event));
diff --git a/tests/baselines/reference/lambdaPropSelf.js b/tests/baselines/reference/lambdaPropSelf.js
index 8d1b16e143186..5e19726f79492 100644
--- a/tests/baselines/reference/lambdaPropSelf.js
+++ b/tests/baselines/reference/lambdaPropSelf.js
@@ -32,7 +32,7 @@ var Person = (function () {
         this.children = ko.observableArray(children);
     }
     return Person;
-})();
+}());
 var T = (function () {
     function T() {
     }
@@ -40,7 +40,7 @@ var T = (function () {
         var x = this;
     };
     return T;
-})();
+}());
 var M;
 (function (M) {
     var x = this;
diff --git a/tests/baselines/reference/libMembers.js b/tests/baselines/reference/libMembers.js
index 38d1356ccc323..46ef17bb6519f 100644
--- a/tests/baselines/reference/libMembers.js
+++ b/tests/baselines/reference/libMembers.js
@@ -27,7 +27,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
     var a = new C[];
     a.length;
diff --git a/tests/baselines/reference/lift.js b/tests/baselines/reference/lift.js
index a832b34641dd3..568379948bcf3 100644
--- a/tests/baselines/reference/lift.js
+++ b/tests/baselines/reference/lift.js
@@ -28,7 +28,7 @@ var B = (function () {
         this.y = y;
     }
     return B;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C(y, z, w) {
@@ -39,4 +39,4 @@ var C = (function (_super) {
     C.prototype.liftxyz = function () { return x + z + this.y; };
     C.prototype.liftxylocllz = function () { return x + z + this.y + this.ll; };
     return C;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/listFailure.js b/tests/baselines/reference/listFailure.js
index fa2fc9b345379..ab0e9ca5bff0b 100644
--- a/tests/baselines/reference/listFailure.js
+++ b/tests/baselines/reference/listFailure.js
@@ -54,7 +54,7 @@ var Editor;
             return lineEntry;
         };
         return Buffer;
-    })();
+    }());
     Editor.Buffer = Buffer;
     function ListRemoveEntry(entry) {
         return entry;
@@ -79,11 +79,11 @@ var Editor;
             return (ListRemoveEntry(this.next));
         };
         return List;
-    })();
+    }());
     var Line = (function () {
         function Line() {
         }
         return Line;
-    })();
+    }());
     Editor.Line = Line;
 })(Editor || (Editor = {}));
diff --git a/tests/baselines/reference/literalsInComputedProperties1.js b/tests/baselines/reference/literalsInComputedProperties1.js
index ef11dbff6ea4a..82a6367e5d274 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.js
+++ b/tests/baselines/reference/literalsInComputedProperties1.js
@@ -73,7 +73,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var z;
 z[1].toExponential();
 z[2].toExponential();
diff --git a/tests/baselines/reference/localClassesInLoop.js b/tests/baselines/reference/localClassesInLoop.js
index 7912b2ef0d630..0090ada863d57 100644
--- a/tests/baselines/reference/localClassesInLoop.js
+++ b/tests/baselines/reference/localClassesInLoop.js
@@ -18,7 +18,7 @@ var _loop_1 = function(x) {
         function C() {
         }
         return C;
-    })();
+    }());
     data.push(function () { return C; });
 };
 for (var x = 0; x < 2; ++x) {
diff --git a/tests/baselines/reference/localTypes1.js b/tests/baselines/reference/localTypes1.js
index 00c65db2c9620..a4f835c8669c7 100644
--- a/tests/baselines/reference/localTypes1.js
+++ b/tests/baselines/reference/localTypes1.js
@@ -158,7 +158,7 @@ function f1() {
         function C() {
         }
         return C;
-    })();
+    }());
     var a = [new C()];
     a[0].x = E.B;
     return a;
@@ -175,7 +175,7 @@ function f2() {
             function C() {
             }
             return C;
-        })();
+        }());
         var a = [new C()];
         a[0].x = E.B;
         return a;
@@ -195,7 +195,7 @@ function f3(b) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             var a = [new C()];
             a[0].x = E.B;
             return a;
@@ -205,7 +205,7 @@ function f3(b) {
                 function A_1() {
                 }
                 return A_1;
-            })();
+            }());
             var c = [new A_1()];
             c[0].x = E.B;
             return c;
@@ -224,7 +224,7 @@ function f5() {
             function C() {
             }
             return C;
-        })();
+        }());
         return new C();
     };
     var z2 = function () {
@@ -238,7 +238,7 @@ function f5() {
             function C() {
             }
             return C;
-        })();
+        }());
         return new C();
     };
 }
@@ -254,7 +254,7 @@ var A = (function () {
             function C() {
             }
             return C;
-        })();
+        }());
     }
     A.prototype.m = function () {
         var E;
@@ -267,7 +267,7 @@ var A = (function () {
             function C() {
             }
             return C;
-        })();
+        }());
         return new C();
     };
     Object.defineProperty(A.prototype, "p", {
@@ -282,20 +282,20 @@ var A = (function () {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             return new C();
         },
         enumerable: true,
         configurable: true
     });
     return A;
-})();
+}());
 function f6() {
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     function g() {
         var B = (function (_super) {
             __extends(B, _super);
@@ -303,7 +303,7 @@ function f6() {
                 _super.apply(this, arguments);
             }
             return B;
-        })(A);
+        }(A));
         function h() {
             var C = (function (_super) {
                 __extends(C, _super);
@@ -311,7 +311,7 @@ function f6() {
                     _super.apply(this, arguments);
                 }
                 return C;
-            })(B);
+            }(B));
             var x = new C();
             x.a = "a";
             x.b = "b";
diff --git a/tests/baselines/reference/localTypes2.js b/tests/baselines/reference/localTypes2.js
index a95844f0794ab..e8713f75241f6 100644
--- a/tests/baselines/reference/localTypes2.js
+++ b/tests/baselines/reference/localTypes2.js
@@ -50,7 +50,7 @@ function f1() {
                 this.y = y;
             }
             return C;
-        })();
+        }());
         return C;
     }
     var C = f();
@@ -66,7 +66,7 @@ function f2() {
                 this.x = x;
             }
             return C;
-        })();
+        }());
         return C;
     }
     var C = f(10);
@@ -82,7 +82,7 @@ function f3() {
                 this.y = y;
             }
             return C;
-        })();
+        }());
         return C;
     }
     var C = f(10, 20);
diff --git a/tests/baselines/reference/localTypes3.js b/tests/baselines/reference/localTypes3.js
index 2d40bc922b94b..462959e68d1a7 100644
--- a/tests/baselines/reference/localTypes3.js
+++ b/tests/baselines/reference/localTypes3.js
@@ -50,7 +50,7 @@ function f1() {
                 this.y = y;
             }
             return C;
-        })();
+        }());
         return C;
     }
     var C = f();
@@ -66,7 +66,7 @@ function f2() {
                 this.x = x;
             }
             return C;
-        })();
+        }());
         return C;
     }
     var C = f(10);
@@ -82,7 +82,7 @@ function f3() {
                 this.y = y;
             }
             return C;
-        })();
+        }());
         return C;
     }
     var C = f(10, "hello");
diff --git a/tests/baselines/reference/localTypes5.js b/tests/baselines/reference/localTypes5.js
index 872629276d2fc..c7f0f722741e8 100644
--- a/tests/baselines/reference/localTypes5.js
+++ b/tests/baselines/reference/localTypes5.js
@@ -26,12 +26,12 @@ function foo() {
                     function Y() {
                     }
                     return Y;
-                })();
+                }());
                 return new Y();
             })();
         };
         return X;
-    })();
+    }());
     var x = new X();
     return x.m();
 }
diff --git a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js
index 61a1d4c01d1a5..6f51a3cdda02d 100644
--- a/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/logicalNotOperatorWithAnyOtherType.js
@@ -78,7 +78,7 @@ var A = (function () {
         return a;
     };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js
index 6af1f67f7cfc8..bd273fffc3677 100644
--- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.js
+++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.js
@@ -47,7 +47,7 @@ var A = (function () {
     }
     A.foo = function () { return false; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.js b/tests/baselines/reference/logicalNotOperatorWithNumberType.js
index b291d31f5b0e5..f643b5452bb78 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.js
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.js
@@ -55,7 +55,7 @@ var A = (function () {
     }
     A.foo = function () { return 1; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.js b/tests/baselines/reference/logicalNotOperatorWithStringType.js
index caf31b78057fa..8a80ed8761aee 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.js
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.js
@@ -54,7 +54,7 @@ var A = (function () {
     }
     A.foo = function () { return ""; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/m7Bugs.js b/tests/baselines/reference/m7Bugs.js
index 86b5aa96c77e1..6292356faf553 100644
--- a/tests/baselines/reference/m7Bugs.js
+++ b/tests/baselines/reference/m7Bugs.js
@@ -38,14 +38,14 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(C1);
+}(C1));
 var y1 = new C2();
 var y2 = new C2();
 var y3 = {};
diff --git a/tests/baselines/reference/matchReturnTypeInAllBranches.js b/tests/baselines/reference/matchReturnTypeInAllBranches.js
index 5e9b88f61ac06..4ac2c63eb4f4d 100644
--- a/tests/baselines/reference/matchReturnTypeInAllBranches.js
+++ b/tests/baselines/reference/matchReturnTypeInAllBranches.js
@@ -62,6 +62,6 @@ var IceCreamMonster = (function () {
         }
     };
     return IceCreamMonster;
-})();
+}());
 var cookieMonster;
 cookieMonster = new IceCreamMonster("Chocolate Chip", false, "COOOOOKIE", "Cookie Monster");
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
index bbeafeab3462a..0071d0dfef091 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
@@ -24,7 +24,7 @@ define(["require", "exports"], function (require, exports) {
             return null;
         };
         return Promise;
-    })();
+    }());
     exports.Promise = Promise;
 });
 //// [memberAccessMustUseModuleInstances_1.js]
diff --git a/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.js b/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.js
index 80c7043552c00..6555151ccd74b 100644
--- a/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.js
+++ b/tests/baselines/reference/memberFunctionOverloadMixingStaticAndInstance.js
@@ -24,19 +24,19 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
     return E;
-})();
+}());
 var F = (function () {
     function F() {
     }
     return F;
-})();
+}());
diff --git a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js
index 584bafad6f60a..ecf9a14033ba0 100644
--- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js
+++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js
@@ -58,7 +58,7 @@ var C = (function () {
     C.foo = function (x, y) { };
     C.bar = function (x, y) { };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -67,7 +67,7 @@ var D = (function () {
     D.foo = function (x, y) { };
     D.bar = function (x, y) { };
     return D;
-})();
+}());
 var c;
 var r = c.foo(1); // error
 var d;
diff --git a/tests/baselines/reference/memberFunctionsWithPublicOverloads.js b/tests/baselines/reference/memberFunctionsWithPublicOverloads.js
index efdd6efaffac7..91b9e82967303 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicOverloads.js
+++ b/tests/baselines/reference/memberFunctionsWithPublicOverloads.js
@@ -49,7 +49,7 @@ var C = (function () {
     C.foo = function (x, y) { };
     C.bar = function (x, y) { };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -58,4 +58,4 @@ var D = (function () {
     D.foo = function (x, y) { };
     D.bar = function (x, y) { };
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js
index 7738bf4fe4e9f..1d8d40533c644 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js
+++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js
@@ -73,7 +73,7 @@ var C = (function () {
     C.bar = function (x, y) { };
     C.baz = function (x, y) { };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -84,7 +84,7 @@ var D = (function () {
     D.bar = function (x, y) { };
     D.baz = function (x, y) { };
     return D;
-})();
+}());
 var c;
 var r = c.foo(1); // error
 var d;
diff --git a/tests/baselines/reference/memberScope.js b/tests/baselines/reference/memberScope.js
index 05123460f9760..f8600053b1e79 100644
--- a/tests/baselines/reference/memberScope.js
+++ b/tests/baselines/reference/memberScope.js
@@ -14,7 +14,7 @@ var Salt;
         function Pepper() {
         }
         return Pepper;
-    })();
+    }());
     Salt.Pepper = Pepper;
     var z = Basil.Pepper;
 })(Salt || (Salt = {}));
diff --git a/tests/baselines/reference/memberVariableDeclarations1.js b/tests/baselines/reference/memberVariableDeclarations1.js
index 7fceee20d2dd9..f72633a7c83e2 100644
--- a/tests/baselines/reference/memberVariableDeclarations1.js
+++ b/tests/baselines/reference/memberVariableDeclarations1.js
@@ -36,7 +36,7 @@ var Employee = (function () {
         this.reports = [];
     }
     return Employee;
-})();
+}());
 var Employee2 = (function () {
     function Employee2() {
         this.retired = false;
@@ -44,7 +44,7 @@ var Employee2 = (function () {
         this.reports = [];
     }
     return Employee2;
-})();
+}());
 var e1;
 var e2;
 e1 = e2;
diff --git a/tests/baselines/reference/mergedClassInterface.js b/tests/baselines/reference/mergedClassInterface.js
index 64b52c23713a8..913c0472cbd51 100644
--- a/tests/baselines/reference/mergedClassInterface.js
+++ b/tests/baselines/reference/mergedClassInterface.js
@@ -59,12 +59,12 @@ var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
     }
     return C4;
-})();
+}());
 // checks if properties actually were merged
 var c5;
 c5.x1;
diff --git a/tests/baselines/reference/mergedInheritedClassInterface.js b/tests/baselines/reference/mergedInheritedClassInterface.js
index 2cc88ac943186..72ac1c8a92882 100644
--- a/tests/baselines/reference/mergedInheritedClassInterface.js
+++ b/tests/baselines/reference/mergedInheritedClassInterface.js
@@ -57,7 +57,7 @@ var BaseClass = (function () {
     }
     BaseClass.prototype.baseMethod = function () { };
     return BaseClass;
-})();
+}());
 var Child = (function (_super) {
     __extends(Child, _super);
     function Child() {
@@ -65,20 +65,20 @@ var Child = (function (_super) {
     }
     Child.prototype.method = function () { };
     return Child;
-})(BaseClass);
+}(BaseClass));
 var ChildNoBaseClass = (function () {
     function ChildNoBaseClass() {
     }
     ChildNoBaseClass.prototype.method2 = function () { };
     return ChildNoBaseClass;
-})();
+}());
 var Grandchild = (function (_super) {
     __extends(Grandchild, _super);
     function Grandchild() {
         _super.apply(this, arguments);
     }
     return Grandchild;
-})(ChildNoBaseClass);
+}(ChildNoBaseClass));
 // checks if properties actually were merged
 var child;
 child.required;
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js
index 2502b46b06bbd..2c9e7fc2da420 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js
@@ -31,16 +31,16 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
     return E;
-})();
+}());
 var a;
 var r = a.x; // error
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
index 26cd3c8bf7ca2..a7e341c31cebd 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
@@ -41,26 +41,26 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
         _super.apply(this, arguments);
     }
     return E;
-})(C2);
+}(C2));
 var a;
 var r = a.x; // error
 var r2 = a.w; // error
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
index 530595d54f6c4..3d9c4e1175ed8 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
@@ -48,29 +48,29 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 var M;
 (function (M) {
     var C = (function () {
         function C() {
         }
         return C;
-    })();
+    }());
     var C2 = (function () {
         function C2() {
         }
         return C2;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases.js
index 56a0b2dd90f18..2bc5d1e0e3688 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.js
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.js
@@ -61,17 +61,17 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var a;
 var r = a.a;
 // generic interfaces in a module
@@ -81,15 +81,15 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     var C2 = (function () {
         function C2() {
         }
         return C2;
-    })();
+    }());
     var D = (function () {
         function D() {
         }
         return D;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js
index 47438374333af..3253a8fc077f3 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.js
@@ -82,27 +82,27 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
     }
     return C4;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var a;
 var r = a.a;
 // generic interfaces in a module
@@ -112,25 +112,25 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     var C2 = (function () {
         function C2() {
         }
         return C2;
-    })();
+    }());
     var C3 = (function () {
         function C3() {
         }
         return C3;
-    })();
+    }());
     var C4 = (function () {
         function C4() {
         }
         return C4;
-    })();
+    }());
     var D = (function () {
         function D() {
         }
         return D;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases3.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases3.js
index 23260e13c4537..1fb5455f82a5c 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases3.js
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases3.js
@@ -42,24 +42,24 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
     }
     return C4;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases4.js b/tests/baselines/reference/mergedInterfacesWithMultipleBases4.js
index 2ee7ba892c214..40292d1a72f70 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases4.js
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases4.js
@@ -40,24 +40,24 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
     }
     return C4;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
index 64a4b9d00bd89..f71702386ecd4 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
@@ -26,7 +26,7 @@ var X;
                 new Y_1.B();
             }
             return A;
-        })();
+        }());
     })(Y = X.Y || (X.Y = {}));
 })(X = exports.X || (exports.X = {}));
 var X;
@@ -37,7 +37,7 @@ var X;
             function B() {
             }
             return B;
-        })();
+        }());
         Y.B = B;
     })(Y = X.Y || (X.Y = {}));
 })(X = exports.X || (exports.X = {}));
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js
index 44ab49d24e0b7..a5bc2e8e56ed7 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.js
@@ -44,7 +44,7 @@ var M;
                 function fudge() {
                 }
                 return fudge;
-            })();
+            }());
             plop_1.fudge = fudge;
             (function (plop) {
             })(plop_1.plop || (plop_1.plop = {}));
diff --git a/tests/baselines/reference/methodContainingLocalFunction.js b/tests/baselines/reference/methodContainingLocalFunction.js
index f2f336d38b77d..d051d46bb1ca9 100644
--- a/tests/baselines/reference/methodContainingLocalFunction.js
+++ b/tests/baselines/reference/methodContainingLocalFunction.js
@@ -61,7 +61,7 @@ var BugExhibition = (function () {
         x = localFunction;
     };
     return BugExhibition;
-})();
+}());
 var BugExhibition2 = (function () {
     function BugExhibition2() {
     }
@@ -76,7 +76,7 @@ var BugExhibition2 = (function () {
         configurable: true
     });
     return BugExhibition2;
-})();
+}());
 var BugExhibition3 = (function () {
     function BugExhibition3() {
     }
@@ -86,7 +86,7 @@ var BugExhibition3 = (function () {
         x = localGenericFunction;
     };
     return BugExhibition3;
-})();
+}());
 var C = (function () {
     function C() {
     }
@@ -96,7 +96,7 @@ var C = (function () {
         x = funcExpr;
     };
     return C;
-})();
+}());
 var M;
 (function (M) {
     function exhibitBug() {
diff --git a/tests/baselines/reference/methodSignatureDeclarationEmit1.js b/tests/baselines/reference/methodSignatureDeclarationEmit1.js
index df6e8d0afe1a0..d8697481c68df 100644
--- a/tests/baselines/reference/methodSignatureDeclarationEmit1.js
+++ b/tests/baselines/reference/methodSignatureDeclarationEmit1.js
@@ -13,7 +13,7 @@ var C = (function () {
     C.prototype.foo = function (a) {
     };
     return C;
-})();
+}());
 
 
 //// [methodSignatureDeclarationEmit1.d.ts]
diff --git a/tests/baselines/reference/mismatchedClassConstructorVariable.js b/tests/baselines/reference/mismatchedClassConstructorVariable.js
index ea3f95559c978..e0b4767f54794 100644
--- a/tests/baselines/reference/mismatchedClassConstructorVariable.js
+++ b/tests/baselines/reference/mismatchedClassConstructorVariable.js
@@ -9,9 +9,9 @@ var baz = (function () {
     function baz() {
     }
     return baz;
-})();
+}());
 var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/mismatchedGenericArguments1.js b/tests/baselines/reference/mismatchedGenericArguments1.js
index a702e369e9519..8a1f67db190cc 100644
--- a/tests/baselines/reference/mismatchedGenericArguments1.js
+++ b/tests/baselines/reference/mismatchedGenericArguments1.js
@@ -23,7 +23,7 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
@@ -31,4 +31,4 @@ var C2 = (function () {
         return null;
     };
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/missingDecoratorType.js b/tests/baselines/reference/missingDecoratorType.js
index 04af1be9d7b67..7356be39798a1 100644
--- a/tests/baselines/reference/missingDecoratorType.js
+++ b/tests/baselines/reference/missingDecoratorType.js
@@ -37,4 +37,4 @@ var C = (function () {
         dec
     ], C.prototype, "method", null);
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.js b/tests/baselines/reference/missingImportAfterModuleImport.js
index 5312f8b0cf6ee..2739ced1cdd94 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.js
+++ b/tests/baselines/reference/missingImportAfterModuleImport.js
@@ -30,7 +30,7 @@ var MainModule = (function () {
     function MainModule() {
     }
     return MainModule;
-})();
+}());
 module.exports = MainModule;
 
 
diff --git a/tests/baselines/reference/missingPropertiesOfClassExpression.js b/tests/baselines/reference/missingPropertiesOfClassExpression.js
index f427da20f0c55..54834397b64c2 100644
--- a/tests/baselines/reference/missingPropertiesOfClassExpression.js
+++ b/tests/baselines/reference/missingPropertiesOfClassExpression.js
@@ -18,9 +18,9 @@ var George = (function (_super) {
         _super.call(this);
     }
     return George;
-})((function () {
+}((function () {
     function class_1() {
     }
     class_1.prototype.reset = function () { return this.y; };
     return class_1;
-})());
+}())));
diff --git a/tests/baselines/reference/missingReturnStatement.js b/tests/baselines/reference/missingReturnStatement.js
index 91c461e47150a..f09ccb4e26e27 100644
--- a/tests/baselines/reference/missingReturnStatement.js
+++ b/tests/baselines/reference/missingReturnStatement.js
@@ -16,6 +16,6 @@ var Test;
         Bug.prototype.foo = function () {
         };
         return Bug;
-    })();
+    }());
     Test.Bug = Bug;
 })(Test || (Test = {}));
diff --git a/tests/baselines/reference/missingReturnStatement1.js b/tests/baselines/reference/missingReturnStatement1.js
index 665194cd5fee0..9e24623fa6c2e 100644
--- a/tests/baselines/reference/missingReturnStatement1.js
+++ b/tests/baselines/reference/missingReturnStatement1.js
@@ -14,4 +14,4 @@ var Foo = (function () {
         //return 4;
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/missingSelf.js b/tests/baselines/reference/missingSelf.js
index 56dcc4f9fa058..e1020ea635b34 100644
--- a/tests/baselines/reference/missingSelf.js
+++ b/tests/baselines/reference/missingSelf.js
@@ -25,7 +25,7 @@ var CalcButton = (function () {
     CalcButton.prototype.a = function () { this.onClick(); };
     CalcButton.prototype.onClick = function () { };
     return CalcButton;
-})();
+}());
 var CalcButton2 = (function () {
     function CalcButton2() {
     }
@@ -35,7 +35,7 @@ var CalcButton2 = (function () {
     };
     CalcButton2.prototype.onClick = function () { };
     return CalcButton2;
-})();
+}());
 var c = new CalcButton();
 c.a();
 var c2 = new CalcButton2();
diff --git a/tests/baselines/reference/missingTypeArguments1.js b/tests/baselines/reference/missingTypeArguments1.js
index 4284753142154..3e22e6ce16b4d 100644
--- a/tests/baselines/reference/missingTypeArguments1.js
+++ b/tests/baselines/reference/missingTypeArguments1.js
@@ -59,64 +59,64 @@ var Y = (function () {
     function Y() {
     }
     return Y;
-})();
+}());
 var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 var a;
 var X2 = (function () {
     function X2() {
     }
     return X2;
-})();
+}());
 var a2;
 var X3 = (function () {
     function X3() {
     }
     return X3;
-})();
+}());
 var a3;
 var X4 = (function () {
     function X4() {
     }
     return X4;
-})();
+}());
 var a4;
 var X5 = (function () {
     function X5() {
     }
     return X5;
-})();
+}());
 var a5;
 var X6 = (function () {
     function X6() {
     }
     return X6;
-})();
+}());
 var a6;
 var X7 = (function () {
     function X7() {
     }
     return X7;
-})();
+}());
 var a7;
 var X8 = (function () {
     function X8() {
     }
     return X8;
-})();
+}());
 var a8;
 var X9 = (function () {
     function X9() {
     }
     return X9;
-})();
+}());
 var a9;
 var X10 = (function () {
     function X10() {
     }
     return X10;
-})();
+}());
 var a10;
diff --git a/tests/baselines/reference/missingTypeArguments2.js b/tests/baselines/reference/missingTypeArguments2.js
index bc5c1d88f4693..6ede66f5598e8 100644
--- a/tests/baselines/reference/missingTypeArguments2.js
+++ b/tests/baselines/reference/missingTypeArguments2.js
@@ -11,7 +11,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var x;
 (function (a) { });
 var y;
diff --git a/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js
index 427bbf65aa19b..eac3729abcdfa 100644
--- a/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js
+++ b/tests/baselines/reference/mixedStaticAndInstanceClassMembers.js
@@ -23,7 +23,7 @@ var A = (function () {
     A.prototype.m1 = function (a) {
     };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
@@ -31,4 +31,4 @@ var B = (function () {
     B.prototype.m1 = function (a) {
     };
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/mixingStaticAndInstanceOverloads.js b/tests/baselines/reference/mixingStaticAndInstanceOverloads.js
index 22367461c2ca1..ee405be1f431a 100644
--- a/tests/baselines/reference/mixingStaticAndInstanceOverloads.js
+++ b/tests/baselines/reference/mixingStaticAndInstanceOverloads.js
@@ -41,29 +41,29 @@ var C1 = (function () {
     }
     C1.foo1 = function (a) { };
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     C2.prototype.foo2 = function (a) { };
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     C3.prototype.foo3 = function (a) { };
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
     }
     C4.foo4 = function (a) { };
     return C4;
-})();
+}());
 var C5 = (function () {
     function C5() {
     }
     C5.prototype.foo5 = function (a) { };
     C5.foo5 = function (a) { };
     return C5;
-})();
+}());
diff --git a/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.js b/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.js
index d571a4143eed1..f7c4db2ff2abf 100644
--- a/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.js
+++ b/tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.js
@@ -17,7 +17,7 @@ function f() {
         C.foo = function () { };
         C.prototype.bar = function () { };
         return C;
-    })();
+    }());
 }
 
 
diff --git a/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js b/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js
index e43e8dd820313..70eea5b2c5c68 100644
--- a/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js
+++ b/tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js
@@ -17,7 +17,7 @@ function g() {
         C.prototype.foo = function () { };
         C.prop2 = 43;
         return C;
-    })();
+    }());
 }
 
 
diff --git a/tests/baselines/reference/modifierOnParameter1.js b/tests/baselines/reference/modifierOnParameter1.js
index 69b54a0938456..7b76a805c99f2 100644
--- a/tests/baselines/reference/modifierOnParameter1.js
+++ b/tests/baselines/reference/modifierOnParameter1.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/moduleAliasInterface.js b/tests/baselines/reference/moduleAliasInterface.js
index 0678656bb0223..2dee62dcca0f8 100644
--- a/tests/baselines/reference/moduleAliasInterface.js
+++ b/tests/baselines/reference/moduleAliasInterface.js
@@ -62,7 +62,7 @@ var _modes;
         function Mode() {
         }
         return Mode;
-    })();
+    }());
     _modes.Mode = Mode;
 })(_modes || (_modes = {}));
 // _modes. // produces an internal error - please implement in derived class
@@ -76,7 +76,7 @@ var editor;
         Bug.prototype.foo = function (p1) {
         };
         return Bug;
-    })();
+    }());
 })(editor || (editor = {}));
 var modesOuter = _modes;
 var editor2;
@@ -86,21 +86,21 @@ var editor2;
         function Bug(p1, p2) {
         } // no error here, since modesOuter is declared externally
         return Bug;
-    })();
+    }());
     var Foo;
     (function (Foo) {
         var Bar = (function () {
             function Bar() {
             }
             return Bar;
-        })();
+        }());
         Foo.Bar = Bar;
     })(Foo || (Foo = {}));
     var Bug2 = (function () {
         function Bug2(p1, p2) {
         }
         return Bug2;
-    })();
+    }());
 })(editor2 || (editor2 = {}));
 var A1;
 (function (A1) {
@@ -108,7 +108,7 @@ var A1;
         function A1C1() {
         }
         return A1C1;
-    })();
+    }());
     A1.A1C1 = A1C1;
 })(A1 || (A1 = {}));
 var B1;
diff --git a/tests/baselines/reference/moduleAsBaseType.js b/tests/baselines/reference/moduleAsBaseType.js
index 7e2af06480d8b..71f168463635a 100644
--- a/tests/baselines/reference/moduleAsBaseType.js
+++ b/tests/baselines/reference/moduleAsBaseType.js
@@ -16,9 +16,9 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(M);
+}(M));
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/moduleAssignmentCompat1.js b/tests/baselines/reference/moduleAssignmentCompat1.js
index 9df11af727036..ba545e96b3334 100644
--- a/tests/baselines/reference/moduleAssignmentCompat1.js
+++ b/tests/baselines/reference/moduleAssignmentCompat1.js
@@ -23,7 +23,7 @@ var A;
         function C() {
         }
         return C;
-    })();
+    }());
     A.C = C;
 })(A || (A = {}));
 var B;
@@ -32,13 +32,13 @@ var B;
         function C() {
         }
         return C;
-    })();
+    }());
     B.C = C;
     var D = (function () {
         function D() {
         }
         return D;
-    })();
+    }());
 })(B || (B = {}));
 var a;
 var b;
diff --git a/tests/baselines/reference/moduleAssignmentCompat2.js b/tests/baselines/reference/moduleAssignmentCompat2.js
index 2e54ba565ee93..cce4f6addf1ef 100644
--- a/tests/baselines/reference/moduleAssignmentCompat2.js
+++ b/tests/baselines/reference/moduleAssignmentCompat2.js
@@ -20,7 +20,7 @@ var A;
         function C() {
         }
         return C;
-    })();
+    }());
     A.C = C;
 })(A || (A = {}));
 var B;
@@ -29,13 +29,13 @@ var B;
         function C() {
         }
         return C;
-    })();
+    }());
     B.C = C;
     var D = (function () {
         function D() {
         }
         return D;
-    })();
+    }());
     B.D = D;
 })(B || (B = {}));
 var a;
diff --git a/tests/baselines/reference/moduleAssignmentCompat4.js b/tests/baselines/reference/moduleAssignmentCompat4.js
index 49e49a2e9fbec..20f7979e43e08 100644
--- a/tests/baselines/reference/moduleAssignmentCompat4.js
+++ b/tests/baselines/reference/moduleAssignmentCompat4.js
@@ -25,7 +25,7 @@ var A;
             function C() {
             }
             return C;
-        })();
+        }());
     })(M = A.M || (A.M = {}));
 })(A || (A = {}));
 var B;
@@ -36,7 +36,7 @@ var B;
             function D() {
             }
             return D;
-        })();
+        }());
         M.D = D;
     })(M = B.M || (B.M = {}));
 })(B || (B = {}));
diff --git a/tests/baselines/reference/moduleClassArrayCodeGenTest.js b/tests/baselines/reference/moduleClassArrayCodeGenTest.js
index 569adcf672ab2..79945f681aaf1 100644
--- a/tests/baselines/reference/moduleClassArrayCodeGenTest.js
+++ b/tests/baselines/reference/moduleClassArrayCodeGenTest.js
@@ -18,13 +18,13 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     var B = (function () {
         function B() {
         }
         return B;
-    })();
+    }());
 })(M || (M = {}));
 var t = [];
 var t2 = [];
diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js
index bfb1d0e56c358..fa09b432ab7ac 100644
--- a/tests/baselines/reference/moduleCodeGenTest5.js
+++ b/tests/baselines/reference/moduleCodeGenTest5.js
@@ -34,7 +34,7 @@ var C1 = (function () {
     }
     C1.prototype.p2 = function () { };
     return C1;
-})();
+}());
 exports.C1 = C1;
 var C2 = (function () {
     function C2() {
@@ -42,7 +42,7 @@ var C2 = (function () {
     }
     C2.prototype.p2 = function () { };
     return C2;
-})();
+}());
 (function (E1) {
     E1[E1["A"] = 0] = "A";
 })(exports.E1 || (exports.E1 = {}));
diff --git a/tests/baselines/reference/moduleCrashBug1.js b/tests/baselines/reference/moduleCrashBug1.js
index 1d8757f2396fe..2a01fa94b4861 100644
--- a/tests/baselines/reference/moduleCrashBug1.js
+++ b/tests/baselines/reference/moduleCrashBug1.js
@@ -28,6 +28,6 @@ var _modes;
         function Mode() {
         }
         return Mode;
-    })();
+    }());
 })(_modes || (_modes = {}));
 var m;
diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js
index 842d1587911b3..1d64c0490c5f8 100644
--- a/tests/baselines/reference/moduleDuplicateIdentifiers.js
+++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js
@@ -57,14 +57,14 @@ var Kettle = (function () {
         this.member1 = 2;
     }
     return Kettle;
-})();
+}());
 exports.Kettle = Kettle;
 var Kettle = (function () {
     function Kettle() {
         this.member2 = 42;
     }
     return Kettle;
-})();
+}());
 exports.Kettle = Kettle;
 exports.Pot = 2;
 exports.Pot = 42; // Shouldn't error
diff --git a/tests/baselines/reference/moduleElementsInWrongContext.js b/tests/baselines/reference/moduleElementsInWrongContext.js
index df4935f9e1916..26fd511a95598 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext.js
@@ -39,7 +39,7 @@
         function C() {
         }
         return C;
-    })();
+    }());
     exports["default"] = C;
     function bee() { }
     exports.bee = bee;
diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.js b/tests/baselines/reference/moduleElementsInWrongContext2.js
index b923bc7861e74..24fccc02dc561 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext2.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext2.js
@@ -39,7 +39,7 @@ function blah() {
         function C() {
         }
         return C;
-    })();
+    }());
     exports["default"] = C;
     function bee() { }
     exports.bee = bee;
diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.js b/tests/baselines/reference/moduleElementsInWrongContext3.js
index 2fa0b60dce41a..c5c0d491cd307 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext3.js
+++ b/tests/baselines/reference/moduleElementsInWrongContext3.js
@@ -42,7 +42,7 @@ var P;
             function C() {
             }
             return C;
-        })();
+        }());
         exports["default"] = C;
         function bee() { }
         P.bee = bee;
diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js
index 724237c35cf27..130091cd61cd1 100644
--- a/tests/baselines/reference/moduleExports1.js
+++ b/tests/baselines/reference/moduleExports1.js
@@ -26,7 +26,7 @@ define(["require", "exports"], function (require, exports) {
                     function Rue() {
                     }
                     return Rue;
-                })();
+                }());
                 Street.Rue = Rue;
             })(Street = Strasse.Street || (Strasse.Street = {}));
         })(Strasse = TypeScript.Strasse || (TypeScript.Strasse = {}));
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
index 81be08f21c2ad..cd2df2633aed0 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -27,12 +27,12 @@ define(["require", "exports"], function (require, exports) {
         function C1() {
         }
         return C1;
-    })();
+    }());
     var Test1 = (function (_super) {
         __extends(Test1, _super);
         function Test1() {
             _super.apply(this, arguments);
         }
         return Test1;
-    })(C1);
+    }(C1));
 });
diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js
index 970cc300b178e..a590e23f71e15 100644
--- a/tests/baselines/reference/moduleInTypePosition1.js
+++ b/tests/baselines/reference/moduleInTypePosition1.js
@@ -17,7 +17,7 @@ var Promise = (function () {
     function Promise() {
     }
     return Promise;
-})();
+}());
 exports.Promise = Promise;
 //// [moduleInTypePosition1_1.js]
 "use strict";
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js
index 1467ec18b91f6..090d6502d5b89 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.js
@@ -58,7 +58,7 @@ var TypeScript;
                 return null;
             };
             return SyntaxCursor;
-        })();
+        }());
     })(Parser = TypeScript.Parser || (TypeScript.Parser = {}));
 })(TypeScript || (TypeScript = {}));
 var TypeScript;
@@ -72,13 +72,13 @@ var TypeScript;
             return TypeScript.Syntax.childIndex();
         };
         return PositionedElement;
-    })();
+    }());
     TypeScript.PositionedElement = PositionedElement;
     var PositionedToken = (function () {
         function PositionedToken(parent, token, fullStart) {
         }
         return PositionedToken;
-    })();
+    }());
     TypeScript.PositionedToken = PositionedToken;
 })(TypeScript || (TypeScript = {}));
 var TypeScript;
@@ -95,7 +95,7 @@ var TypeScript;
             return null;
         };
         return SyntaxNode;
-    })();
+    }());
     TypeScript.SyntaxNode = SyntaxNode;
 })(TypeScript || (TypeScript = {}));
 var TypeScript;
@@ -111,7 +111,7 @@ var TypeScript;
                 return new TypeScript.PositionedToken(parent, this, fullStart);
             };
             return VariableWidthTokenWithTrailingTrivia;
-        })();
+        }());
         Syntax.VariableWidthTokenWithTrailingTrivia = VariableWidthTokenWithTrailingTrivia;
     })(Syntax = TypeScript.Syntax || (TypeScript.Syntax = {}));
 })(TypeScript || (TypeScript = {}));
diff --git a/tests/baselines/reference/moduleMerge.js b/tests/baselines/reference/moduleMerge.js
index aa06bae1597b9..04f2f511b8d35 100644
--- a/tests/baselines/reference/moduleMerge.js
+++ b/tests/baselines/reference/moduleMerge.js
@@ -34,7 +34,7 @@ var A;
             return "from private B";
         };
         return B;
-    })();
+    }());
 })(A || (A = {}));
 var A;
 (function (A) {
@@ -45,6 +45,6 @@ var A;
             return "from export B";
         };
         return B;
-    })();
+    }());
     A.B = B;
 })(A || (A = {}));
diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js
index 70e43e25bbbc6..5ab4ab381e010 100644
--- a/tests/baselines/reference/moduleMergeConstructor.js
+++ b/tests/baselines/reference/moduleMergeConstructor.js
@@ -35,5 +35,5 @@ define(["require", "exports", "foo"], function (require, exports, foo) {
             this.bar = new foo.Foo();
         }
         return Test;
-    })();
+    }());
 });
diff --git a/tests/baselines/reference/moduleNewExportBug.js b/tests/baselines/reference/moduleNewExportBug.js
index ce40915b2f6b5..b48f6dd73b07c 100644
--- a/tests/baselines/reference/moduleNewExportBug.js
+++ b/tests/baselines/reference/moduleNewExportBug.js
@@ -21,6 +21,6 @@ var mod1;
         }
         C.prototype.moo = function () { };
         return C;
-    })();
+    }());
 })(mod1 || (mod1 = {}));
 var c; // ERROR: C should not be visible
diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js
index 904808b9f6b6d..c3512734f94f5 100644
--- a/tests/baselines/reference/modulePrologueAMD.js
+++ b/tests/baselines/reference/modulePrologueAMD.js
@@ -10,6 +10,6 @@ define(["require", "exports"], function (require, exports) {
         function Foo() {
         }
         return Foo;
-    })();
+    }());
     exports.Foo = Foo;
 });
diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js
index 67b704a365070..4a9594d254be5 100644
--- a/tests/baselines/reference/modulePrologueCommonjs.js
+++ b/tests/baselines/reference/modulePrologueCommonjs.js
@@ -9,5 +9,5 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 exports.Foo = Foo;
diff --git a/tests/baselines/reference/modulePrologueSystem.js b/tests/baselines/reference/modulePrologueSystem.js
index 91703d1c7fba7..80a46fb27fccb 100644
--- a/tests/baselines/reference/modulePrologueSystem.js
+++ b/tests/baselines/reference/modulePrologueSystem.js
@@ -14,7 +14,7 @@ System.register([], function(exports_1) {
                 function Foo() {
                 }
                 return Foo;
-            })();
+            }());
             exports_1("Foo", Foo);
         }
     }
diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js
index 65803af6cadec..a573559b7e919 100644
--- a/tests/baselines/reference/modulePrologueUmd.js
+++ b/tests/baselines/reference/modulePrologueUmd.js
@@ -17,6 +17,6 @@ export class Foo {}
         function Foo() {
         }
         return Foo;
-    })();
+    }());
     exports.Foo = Foo;
 });
diff --git a/tests/baselines/reference/moduleRedifinitionErrors.js b/tests/baselines/reference/moduleRedifinitionErrors.js
index 1271463214642..830ea03e1d381 100644
--- a/tests/baselines/reference/moduleRedifinitionErrors.js
+++ b/tests/baselines/reference/moduleRedifinitionErrors.js
@@ -10,4 +10,4 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/moduleReopenedTypeOtherBlock.js b/tests/baselines/reference/moduleReopenedTypeOtherBlock.js
index 951c558ddfd18..3380cd0ec7d7f 100644
--- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.js
+++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.js
@@ -15,7 +15,7 @@ var M;
         function C1() {
         }
         return C1;
-    })();
+    }());
     M.C1 = C1;
 })(M || (M = {}));
 var M;
@@ -25,6 +25,6 @@ var M;
         }
         C2.prototype.f = function () { return null; };
         return C2;
-    })();
+    }());
     M.C2 = C2;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.js b/tests/baselines/reference/moduleReopenedTypeSameBlock.js
index 92e7e9e522888..b9624e75b75bb 100644
--- a/tests/baselines/reference/moduleReopenedTypeSameBlock.js
+++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.js
@@ -13,7 +13,7 @@ var M;
         function C1() {
         }
         return C1;
-    })();
+    }());
     M.C1 = C1;
 })(M || (M = {}));
 var M;
@@ -23,6 +23,6 @@ var M;
         }
         C2.prototype.f = function () { return null; };
         return C2;
-    })();
+    }());
     M.C2 = C2;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/moduleScopingBug.js b/tests/baselines/reference/moduleScopingBug.js
index d9ac55e2b88ae..5d18b2de676cc 100644
--- a/tests/baselines/reference/moduleScopingBug.js
+++ b/tests/baselines/reference/moduleScopingBug.js
@@ -41,7 +41,7 @@ var M;
             var inner = outer; // Ok
         }
         return C;
-    })();
+    }());
     var X;
     (function (X) {
         var inner = outer; // Error: outer not visible
diff --git a/tests/baselines/reference/moduleVisibilityTest1.js b/tests/baselines/reference/moduleVisibilityTest1.js
index f4655513bec59..3278613409d42 100644
--- a/tests/baselines/reference/moduleVisibilityTest1.js
+++ b/tests/baselines/reference/moduleVisibilityTest1.js
@@ -99,7 +99,7 @@ var M;
             this.b = 0;
         }
         return B;
-    })();
+    }());
     var C = (function () {
         function C() {
             this.someProp = 1;
@@ -111,7 +111,7 @@ var M;
         C.prototype.someMethodThatCallsAnOuterInnerMethod = function () { return OuterMod.someExportedOuterFunc(); };
         C.prototype.someMethod = function () { return 0; };
         return C;
-    })();
+    }());
     M.C = C;
     var someModuleVar = 4;
     function someModuleFunction() { return 5; }
diff --git a/tests/baselines/reference/moduleVisibilityTest2.js b/tests/baselines/reference/moduleVisibilityTest2.js
index 9102bd17ae206..51f3b00255baa 100644
--- a/tests/baselines/reference/moduleVisibilityTest2.js
+++ b/tests/baselines/reference/moduleVisibilityTest2.js
@@ -100,7 +100,7 @@ var M;
             this.b = 0;
         }
         return B;
-    })();
+    }());
     var C = (function () {
         function C() {
             this.someProp = 1;
@@ -112,7 +112,7 @@ var M;
         C.prototype.someMethodThatCallsAnOuterInnerMethod = function () { return OuterMod.someExportedOuterFunc(); };
         C.prototype.someMethod = function () { return 0; };
         return C;
-    })();
+    }());
     M.C = C;
     var someModuleVar = 4;
     function someModuleFunction() { return 5; }
diff --git a/tests/baselines/reference/moduleVisibilityTest3.js b/tests/baselines/reference/moduleVisibilityTest3.js
index 7032c8dc3d7ea..deeec304d988d 100644
--- a/tests/baselines/reference/moduleVisibilityTest3.js
+++ b/tests/baselines/reference/moduleVisibilityTest3.js
@@ -33,7 +33,7 @@ var _modes;
         function Mode() {
         }
         return Mode;
-    })();
+    }());
 })(_modes || (_modes = {}));
 //_modes. // produces an internal error - please implement in derived class
 var editor;
@@ -45,5 +45,5 @@ var editor;
             var x;
         }
         return Bug;
-    })();
+    }());
 })(editor || (editor = {}));
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
index aeffc8d6e5bef..ec434286f4327 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
@@ -70,33 +70,33 @@ var A;
         function A() {
         }
         return A;
-    })();
+    }());
     var AA = (function () {
         function AA() {
         }
         return AA;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(AA);
+    }(AA));
     var BB = (function (_super) {
         __extends(BB, _super);
         function BB() {
             _super.apply(this, arguments);
         }
         return BB;
-    })(A);
+    }(A));
     var Module;
     (function (Module) {
         var A = (function () {
             function A() {
             }
             return A;
-        })();
+        }());
     })(Module || (Module = {}));
     var Color;
     (function (Color) {
@@ -119,13 +119,13 @@ var Y;
         function A() {
         }
         return A;
-    })();
+    }());
     Y.A = A;
     var AA = (function () {
         function AA() {
         }
         return AA;
-    })();
+    }());
     Y.AA = AA;
     var B = (function (_super) {
         __extends(B, _super);
@@ -133,7 +133,7 @@ var Y;
             _super.apply(this, arguments);
         }
         return B;
-    })(AA);
+    }(AA));
     Y.B = B;
     var BB = (function (_super) {
         __extends(BB, _super);
@@ -141,7 +141,7 @@ var Y;
             _super.apply(this, arguments);
         }
         return BB;
-    })(A);
+    }(A));
     Y.BB = BB;
     var Module;
     (function (Module) {
@@ -149,7 +149,7 @@ var Y;
             function A() {
             }
             return A;
-        })();
+        }());
     })(Module = Y.Module || (Y.Module = {}));
     (function (Color) {
         Color[Color["Blue"] = 0] = "Blue";
diff --git a/tests/baselines/reference/moduledecl.js b/tests/baselines/reference/moduledecl.js
index f835729dc4db2..2e765e512d88e 100644
--- a/tests/baselines/reference/moduledecl.js
+++ b/tests/baselines/reference/moduledecl.js
@@ -244,7 +244,7 @@ var m0;
         function c1() {
         }
         return c1;
-    })();
+    }());
 })(m0 || (m0 = {}));
 var m1;
 (function (m1) {
@@ -265,7 +265,7 @@ var m1;
             return "Hello";
         };
         return c1;
-    })();
+    }());
     m1.c1 = c1;
 })(m1 || (m1 = {}));
 var m;
@@ -315,7 +315,7 @@ var exportTests;
             return "string";
         };
         return C1_public;
-    })();
+    }());
     exportTests.C1_public = C1_public;
     var C2_private = (function () {
         function C2_private() {
@@ -327,7 +327,7 @@ var exportTests;
             return "string";
         };
         return C2_private;
-    })();
+    }());
     var C3_public = (function () {
         function C3_public() {
         }
@@ -356,7 +356,7 @@ var exportTests;
             configurable: true
         });
         return C3_public;
-    })();
+    }());
     exportTests.C3_public = C3_public;
 })(exportTests || (exportTests = {}));
 function foo() {
diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js
index 28ebecdd0f0ae..34832c9396690 100644
--- a/tests/baselines/reference/multiImportExport.js
+++ b/tests/baselines/reference/multiImportExport.js
@@ -33,7 +33,7 @@ var Adder = (function () {
     Adder.prototype.add = function (a, b) {
     };
     return Adder;
-})();
+}());
 module.exports = Adder;
 //// [Math.js]
 "use strict";
diff --git a/tests/baselines/reference/multiModuleClodule1.js b/tests/baselines/reference/multiModuleClodule1.js
index 9f6d7b5014c53..b5b110583689e 100644
--- a/tests/baselines/reference/multiModuleClodule1.js
+++ b/tests/baselines/reference/multiModuleClodule1.js
@@ -26,7 +26,7 @@ var C = (function () {
     C.prototype.bar = function () { };
     C.boo = function () { };
     return C;
-})();
+}());
 var C;
 (function (C) {
     C.x = 1;
diff --git a/tests/baselines/reference/multipleClassPropertyModifiers.js b/tests/baselines/reference/multipleClassPropertyModifiers.js
index 7dec786c447dd..294e303e25444 100644
--- a/tests/baselines/reference/multipleClassPropertyModifiers.js
+++ b/tests/baselines/reference/multipleClassPropertyModifiers.js
@@ -11,4 +11,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/multipleClassPropertyModifiersErrors.js b/tests/baselines/reference/multipleClassPropertyModifiersErrors.js
index 191476e9a6215..5bfa6979ef2dd 100644
--- a/tests/baselines/reference/multipleClassPropertyModifiersErrors.js
+++ b/tests/baselines/reference/multipleClassPropertyModifiersErrors.js
@@ -14,4 +14,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js
index 2a9dc18ca7779..e15f8fc879c15 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -24,7 +24,7 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = foo;
 function bar() {
diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js
index d5699d850c0e4..748837baceb56 100644
--- a/tests/baselines/reference/multipleDefaultExports03.js
+++ b/tests/baselines/reference/multipleDefaultExports03.js
@@ -12,13 +12,13 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = C;
diff --git a/tests/baselines/reference/multipleInheritance.js b/tests/baselines/reference/multipleInheritance.js
index 901838b584b82..26372bfb71827 100644
--- a/tests/baselines/reference/multipleInheritance.js
+++ b/tests/baselines/reference/multipleInheritance.js
@@ -48,59 +48,59 @@ var B1 = (function () {
     function B1() {
     }
     return B1;
-})();
+}());
 var B2 = (function () {
     function B2() {
     }
     return B2;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(B1);
+}(B1));
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
         _super.apply(this, arguments);
     }
     return D1;
-})(B1);
+}(B1));
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
         _super.apply(this, arguments);
     }
     return D2;
-})(B2);
+}(B2));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
         _super.apply(this, arguments);
     }
     return E;
-})(D1);
+}(D1));
 var N = (function () {
     function N() {
     }
     return N;
-})();
+}());
 var ND = (function (_super) {
     __extends(ND, _super);
     function ND() {
         _super.apply(this, arguments);
     }
     return ND;
-})(N);
+}(N));
 var Good = (function () {
     function Good() {
         this.f = function () { return 0; };
     }
     Good.prototype.g = function () { return 0; };
     return Good;
-})();
+}());
 var Baad = (function (_super) {
     __extends(Baad, _super);
     function Baad() {
@@ -109,4 +109,4 @@ var Baad = (function (_super) {
     Baad.prototype.f = function () { return 0; };
     Baad.prototype.g = function (n) { return 0; };
     return Baad;
-})(Good);
+}(Good));
diff --git a/tests/baselines/reference/multipleNumericIndexers.js b/tests/baselines/reference/multipleNumericIndexers.js
index 638cf01569a17..7b5207d230330 100644
--- a/tests/baselines/reference/multipleNumericIndexers.js
+++ b/tests/baselines/reference/multipleNumericIndexers.js
@@ -38,11 +38,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b = { 1: '', "2": '' };
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/multipleStringIndexers.js b/tests/baselines/reference/multipleStringIndexers.js
index 55dd816e42b0f..98db93c70550e 100644
--- a/tests/baselines/reference/multipleStringIndexers.js
+++ b/tests/baselines/reference/multipleStringIndexers.js
@@ -37,11 +37,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b = { y: '' };
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/multivar.js b/tests/baselines/reference/multivar.js
index 3f9796d2944f3..f24728fef9262 100644
--- a/tests/baselines/reference/multivar.js
+++ b/tests/baselines/reference/multivar.js
@@ -60,13 +60,13 @@ var m2;
             this.b = b;
         }
         return C;
-    })();
+    }());
     var C2 = (function () {
         function C2(b) {
             this.b = b;
         }
         return C2;
-    })();
+    }());
     m2.C2 = C2;
     var m;
     var b2;
diff --git a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
index 09f4be0c4e947..c8cca671327e1 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
@@ -21,12 +21,12 @@ var foo = (function () {
     }
     foo.prototype.bar = function () { return null; };
     return foo;
-})();
+}());
 var foo2 = (function (_super) {
     __extends(foo2, _super);
     function foo2() {
         _super.apply(this, arguments);
     }
     return foo2;
-})(foo);
+}(foo));
 var test = new foo();
diff --git a/tests/baselines/reference/nameCollision.js b/tests/baselines/reference/nameCollision.js
index 0e559b7091cc8..4f41bf4a086b7 100644
--- a/tests/baselines/reference/nameCollision.js
+++ b/tests/baselines/reference/nameCollision.js
@@ -66,7 +66,7 @@ var B;
         function B() {
         }
         return B;
-    })();
+    }());
 })(B || (B = {}));
 var X;
 (function (X_1) {
diff --git a/tests/baselines/reference/nameCollisions.js b/tests/baselines/reference/nameCollisions.js
index 96ae2e9838bcc..a36f66e8dc9b4 100644
--- a/tests/baselines/reference/nameCollisions.js
+++ b/tests/baselines/reference/nameCollisions.js
@@ -57,7 +57,7 @@ var T;
             function Bar() {
             }
             return Bar;
-        })();
+        }());
         x.Bar = Bar;
     })(x || (x = {}));
     var z;
@@ -73,7 +73,7 @@ var T;
         function y() {
         }
         return y;
-    })(); // error
+    }()); // error
     var w;
     var f;
     function f() { } //error
@@ -84,23 +84,23 @@ var T;
         function C() {
         }
         return C;
-    })();
+    }());
     function C() { } // error
     function C2() { }
     var C2 = (function () {
         function C2() {
         }
         return C2;
-    })(); // error
+    }()); // error
     function fi() { }
     var cli = (function () {
         function cli() {
         }
         return cli;
-    })();
+    }());
     var cli2 = (function () {
         function cli2() {
         }
         return cli2;
-    })();
+    }());
 })(T || (T = {}));
diff --git a/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.js b/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.js
index 0ce927b78c7c1..a0aaa82e895ee 100644
--- a/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.js
+++ b/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.js
@@ -21,4 +21,4 @@ var Foo = (function () {
         }; // this shouldn't crash the compiler...
     }
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/namespaces2.js b/tests/baselines/reference/namespaces2.js
index 980d6ea92432d..b7b1c38f08d06 100644
--- a/tests/baselines/reference/namespaces2.js
+++ b/tests/baselines/reference/namespaces2.js
@@ -16,7 +16,7 @@ var A;
             function C() {
             }
             return C;
-        })();
+        }());
         B.C = C;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
diff --git a/tests/baselines/reference/narrowTypeByInstanceof.js b/tests/baselines/reference/narrowTypeByInstanceof.js
index 11f55089bdac9..0415c72b9fd76 100644
--- a/tests/baselines/reference/narrowTypeByInstanceof.js
+++ b/tests/baselines/reference/narrowTypeByInstanceof.js
@@ -33,7 +33,7 @@ var Match = (function () {
         return undefined;
     };
     return Match;
-})();
+}());
 var FileMatch = (function () {
     function FileMatch() {
     }
@@ -41,7 +41,7 @@ var FileMatch = (function () {
         return undefined;
     };
     return FileMatch;
-})();
+}());
 var elementA, elementB;
 if (elementA instanceof FileMatch && elementB instanceof FileMatch) {
     var a = elementA.resource().path;
diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.js b/tests/baselines/reference/negateOperatorWithAnyOtherType.js
index e0dd9b184c3bc..6a2fe74c7ba7c 100644
--- a/tests/baselines/reference/negateOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.js
@@ -72,7 +72,7 @@ var A = (function () {
         return a;
     };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.js b/tests/baselines/reference/negateOperatorWithBooleanType.js
index c357849d8a59b..07d404b0c6c9f 100644
--- a/tests/baselines/reference/negateOperatorWithBooleanType.js
+++ b/tests/baselines/reference/negateOperatorWithBooleanType.js
@@ -44,7 +44,7 @@ var A = (function () {
     }
     A.foo = function () { return false; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.js b/tests/baselines/reference/negateOperatorWithNumberType.js
index 8a29830e3e466..42b78dc0a2b16 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.js
+++ b/tests/baselines/reference/negateOperatorWithNumberType.js
@@ -51,7 +51,7 @@ var A = (function () {
     }
     A.foo = function () { return 1; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/negateOperatorWithStringType.js b/tests/baselines/reference/negateOperatorWithStringType.js
index 2b79819894cb3..8a70f5e280550 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.js
+++ b/tests/baselines/reference/negateOperatorWithStringType.js
@@ -50,7 +50,7 @@ var A = (function () {
     }
     A.foo = function () { return ""; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/nestedClassDeclaration.js b/tests/baselines/reference/nestedClassDeclaration.js
index 2fee6f08ab950..f9e3d08144d4a 100644
--- a/tests/baselines/reference/nestedClassDeclaration.js
+++ b/tests/baselines/reference/nestedClassDeclaration.js
@@ -24,18 +24,18 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 function foo() {
     var C3 = (function () {
         function C3() {
         }
         return C3;
-    })();
+    }());
 }
 var x = {
     class: C4 }, _a = void 0;
diff --git a/tests/baselines/reference/nestedSelf.js b/tests/baselines/reference/nestedSelf.js
index 9c0feaa887f33..ea6abc8e1e8fc 100644
--- a/tests/baselines/reference/nestedSelf.js
+++ b/tests/baselines/reference/nestedSelf.js
@@ -20,6 +20,6 @@ var M;
             [1, 2, 3].map(function (x) { return _this.n * x; });
         };
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/newArrays.js b/tests/baselines/reference/newArrays.js
index adc51eb843ae2..d156ee24f1c13 100644
--- a/tests/baselines/reference/newArrays.js
+++ b/tests/baselines/reference/newArrays.js
@@ -19,7 +19,7 @@ var M;
         function Foo() {
         }
         return Foo;
-    })();
+    }());
     var Gar = (function () {
         function Gar() {
             this.x = 10;
@@ -29,5 +29,5 @@ var M;
             this.fa = new Array(this.x * this.y);
         };
         return Gar;
-    })();
+    }());
 })(M || (M = {}));
diff --git a/tests/baselines/reference/newOnInstanceSymbol.js b/tests/baselines/reference/newOnInstanceSymbol.js
index a66e4d7425516..755cc35e19ef0 100644
--- a/tests/baselines/reference/newOnInstanceSymbol.js
+++ b/tests/baselines/reference/newOnInstanceSymbol.js
@@ -8,6 +8,6 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var x = new C(); // should be ok
 new x(); // should error
diff --git a/tests/baselines/reference/newOperator.js b/tests/baselines/reference/newOperator.js
index 95dc410142e99..75ad42de8c3e0 100644
--- a/tests/baselines/reference/newOperator.js
+++ b/tests/baselines/reference/newOperator.js
@@ -75,7 +75,7 @@ var M;
         function T() {
         }
         return T;
-    })();
+    }());
     M.T = T;
 })(M || (M = {}));
 var S = (function () {
@@ -89,4 +89,4 @@ var S = (function () {
         configurable: true
     });
     return S;
-})();
+}());
diff --git a/tests/baselines/reference/newOperatorConformance.js b/tests/baselines/reference/newOperatorConformance.js
index a04b10dc8fec9..3b84cbd669880 100644
--- a/tests/baselines/reference/newOperatorConformance.js
+++ b/tests/baselines/reference/newOperatorConformance.js
@@ -68,17 +68,17 @@ var C0 = (function () {
     function C0() {
     }
     return C0;
-})();
+}());
 var C1 = (function () {
     function C1(n, s) {
     }
     return C1;
-})();
+}());
 var T = (function () {
     function T(n) {
     }
     return T;
-})();
+}());
 var anyCtor;
 var anyCtor1;
 var nestedCtor;
diff --git a/tests/baselines/reference/newOperatorErrorCases.js b/tests/baselines/reference/newOperatorErrorCases.js
index b893beba02a90..6d57f9a090e6e 100644
--- a/tests/baselines/reference/newOperatorErrorCases.js
+++ b/tests/baselines/reference/newOperatorErrorCases.js
@@ -43,17 +43,17 @@ var C0 = (function () {
     function C0() {
     }
     return C0;
-})();
+}());
 var C1 = (function () {
     function C1(n, s) {
     }
     return C1;
-})();
+}());
 var T = (function () {
     function T(n) {
     }
     return T;
-})();
+}());
 var anyCtor;
 var anyCtor1;
 var nestedCtor;
diff --git a/tests/baselines/reference/newWithSpread.js b/tests/baselines/reference/newWithSpread.js
index 3161eb9f67e29..3b4a726b4d464 100644
--- a/tests/baselines/reference/newWithSpread.js
+++ b/tests/baselines/reference/newWithSpread.js
@@ -118,7 +118,7 @@ var B = (function () {
         }
     }
     return B;
-})();
+}());
 var a;
 var b;
 var c;
diff --git a/tests/baselines/reference/newWithSpreadES5.js b/tests/baselines/reference/newWithSpreadES5.js
index f74702662731e..fffa53d7c9072 100644
--- a/tests/baselines/reference/newWithSpreadES5.js
+++ b/tests/baselines/reference/newWithSpreadES5.js
@@ -117,7 +117,7 @@ var B = (function () {
         }
     }
     return B;
-})();
+}());
 var a;
 var b;
 var c;
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js b/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js
index 8a485a2ebe25e..b31eccee9b5ec 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js
+++ b/tests/baselines/reference/noCollisionThisExpressionAndClassInGlobal.js
@@ -8,5 +8,5 @@ var _this = (function () {
     function _this() {
     }
     return _this;
-})();
+}());
 var f = function () { return _this; };
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js
index 727b1b6087aab..43218ef9697c1 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInAccessors.js
@@ -69,7 +69,7 @@ var class1 = (function () {
         configurable: true
     });
     return class1;
-})();
+}());
 var class2 = (function () {
     function class2() {
     }
@@ -95,4 +95,4 @@ var class2 = (function () {
         configurable: true
     });
     return class2;
-})();
+}());
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js
index a01996848b13b..79d0fd5549cdc 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.js
@@ -32,7 +32,7 @@ var class1 = (function () {
         };
     }
     return class1;
-})();
+}());
 var class2 = (function () {
     function class2() {
         var _this = 2;
@@ -43,4 +43,4 @@ var class2 = (function () {
         };
     }
     return class2;
-})();
+}());
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js
index b7e9cc7561fae..b7fdfc5a49d5d 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.js
@@ -41,4 +41,4 @@ var a = (function () {
         };
     };
     return a;
-})();
+}());
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js
index da989bed263ff..3265da26d147f 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.js
@@ -30,7 +30,7 @@ var class1 = (function () {
         };
     }
     return class1;
-})();
+}());
 var class2 = (function () {
     function class2() {
         this.prop1 = {
@@ -41,4 +41,4 @@ var class2 = (function () {
         var _this = 2;
     }
     return class2;
-})();
+}());
diff --git a/tests/baselines/reference/noConstraintInReturnType1.js b/tests/baselines/reference/noConstraintInReturnType1.js
index 0402f9d83cba8..03ce629c4460d 100644
--- a/tests/baselines/reference/noConstraintInReturnType1.js
+++ b/tests/baselines/reference/noConstraintInReturnType1.js
@@ -10,7 +10,7 @@ var List = (function () {
     }
     List.empty = function () { return null; };
     return List;
-})();
+}());
 
 
 //// [noConstraintInReturnType1.d.ts]
diff --git a/tests/baselines/reference/noEmitHelpers.js b/tests/baselines/reference/noEmitHelpers.js
index bfe5a4f44459a..b2c26c6af75df 100644
--- a/tests/baselines/reference/noEmitHelpers.js
+++ b/tests/baselines/reference/noEmitHelpers.js
@@ -9,11 +9,11 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/noEmitHelpers2.js b/tests/baselines/reference/noEmitHelpers2.js
index 66e2ff78b647b..f3bbfe54896d8 100644
--- a/tests/baselines/reference/noEmitHelpers2.js
+++ b/tests/baselines/reference/noEmitHelpers2.js
@@ -18,4 +18,4 @@ var A = (function () {
         __metadata('design:paramtypes', [Number, String])
     ], A);
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/noErrorsInCallback.js b/tests/baselines/reference/noErrorsInCallback.js
index cb6c4e41f8cb6..6a08cee12cfdf 100644
--- a/tests/baselines/reference/noErrorsInCallback.js
+++ b/tests/baselines/reference/noErrorsInCallback.js
@@ -14,7 +14,7 @@ var Bar = (function () {
         this.foo = foo;
     }
     return Bar;
-})();
+}());
 var one = new Bar({}); // Error
 [].forEach(function () {
     var two = new Bar({}); // No error?
diff --git a/tests/baselines/reference/noImplicitAnyForMethodParameters.js b/tests/baselines/reference/noImplicitAnyForMethodParameters.js
index fc5b94d4768d6..ea868ee7503a2 100644
--- a/tests/baselines/reference/noImplicitAnyForMethodParameters.js
+++ b/tests/baselines/reference/noImplicitAnyForMethodParameters.js
@@ -20,10 +20,10 @@ var C = (function () {
     }
     C.prototype.foo = function (a) { }; // OK - non-ambient class and private method - error
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     D.prototype.foo = function (a) { }; // OK - non-ambient class and public method - error
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/noImplicitAnyParametersInClass.js b/tests/baselines/reference/noImplicitAnyParametersInClass.js
index 0873935b6002d..0e24793652907 100644
--- a/tests/baselines/reference/noImplicitAnyParametersInClass.js
+++ b/tests/baselines/reference/noImplicitAnyParametersInClass.js
@@ -196,4 +196,4 @@ var C = (function () {
     };
     C.prototype.priv_f8 = function (x3, y3) { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/noTypeArgumentOnReturnType1.js b/tests/baselines/reference/noTypeArgumentOnReturnType1.js
index ca13067c15ead..7ede1e57c3e56 100644
--- a/tests/baselines/reference/noTypeArgumentOnReturnType1.js
+++ b/tests/baselines/reference/noTypeArgumentOnReturnType1.js
@@ -14,4 +14,4 @@ var A = (function () {
         return null;
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
index 7cdb702d6ffab..b9927ebf193e9 100644
--- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
+++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
@@ -15,11 +15,11 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Bar = (function (_super) {
     __extends(Bar, _super);
     function Bar() {
         _super.apply(this, arguments);
     }
     return Bar;
-})(Foo); // Valid
+}(Foo)); // Valid
diff --git a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js
index 5558cb2fc8ba3..a1fa710d8932c 100644
--- a/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js
+++ b/tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js
@@ -29,7 +29,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var E;
 (function (E) {
 })(E || (E = {}));
@@ -42,7 +42,7 @@ function f() {
         function C() {
         }
         return C;
-    })();
+    }());
     var E;
     (function (E) {
     })(E || (E = {}));
diff --git a/tests/baselines/reference/nonInstantiatedModule.js b/tests/baselines/reference/nonInstantiatedModule.js
index fc3ad19546f4a..f8063dd7b1414 100644
--- a/tests/baselines/reference/nonInstantiatedModule.js
+++ b/tests/baselines/reference/nonInstantiatedModule.js
@@ -77,6 +77,6 @@ var M3;
         function Utils() {
         }
         return Utils;
-    })();
+    }());
     M3.Utils = Utils;
 })(M3 || (M3 = {}));
diff --git a/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js
index 3ca6a96351523..d4ac9685f6171 100644
--- a/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js
+++ b/tests/baselines/reference/nonMergedDeclarationsAndOverloads.js
@@ -16,4 +16,4 @@ var A = (function () {
     A.prototype.m1 = function (a) {
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/null.js b/tests/baselines/reference/null.js
index ee897643fb172..a58c5f7ed1633 100644
--- a/tests/baselines/reference/null.js
+++ b/tests/baselines/reference/null.js
@@ -30,7 +30,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 function f() {
     return null;
     return new C();
diff --git a/tests/baselines/reference/nullAssignableToEveryType.js b/tests/baselines/reference/nullAssignableToEveryType.js
index 9917ebeac9e95..7d8ddd7fd74a2 100644
--- a/tests/baselines/reference/nullAssignableToEveryType.js
+++ b/tests/baselines/reference/nullAssignableToEveryType.js
@@ -48,7 +48,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var ac;
 var ai;
 var E;
diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js
index 646a347453663..d285818aaa9ec 100644
--- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js
+++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.js
@@ -121,7 +121,7 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var c1;
 var r10 = true ? c1 : null;
 var r10 = true ? null : c1;
@@ -129,7 +129,7 @@ var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var c2;
 var r12 = true ? c2 : null;
 var r12 = true ? null : c2;
@@ -153,7 +153,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var c;
 (function (c) {
     c.bar = 1;
diff --git a/tests/baselines/reference/numericClassMembers1.js b/tests/baselines/reference/numericClassMembers1.js
index 4b17677b8a446..244343071257d 100644
--- a/tests/baselines/reference/numericClassMembers1.js
+++ b/tests/baselines/reference/numericClassMembers1.js
@@ -22,18 +22,18 @@ var C234 = (function () {
         this[0.0] = 2;
     }
     return C234;
-})();
+}());
 var C235 = (function () {
     function C235() {
         this[0.0] = 1;
         this['0'] = 2;
     }
     return C235;
-})();
+}());
 var C236 = (function () {
     function C236() {
         this['0.0'] = 1;
         this['0'] = 2;
     }
     return C236;
-})();
+}());
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js
index cf08bb9821766..33a03705965c5 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations.js
@@ -123,7 +123,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var a;
 // error
 var b = {
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
index ade000d50ba6c..cef2759e1d530 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
@@ -57,7 +57,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { return ''; };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -65,12 +65,12 @@ var B = (function (_super) {
     }
     B.prototype.bar = function () { return ''; };
     return B;
-})(A);
+}(A));
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var a;
 // error
 var b = {
diff --git a/tests/baselines/reference/numericIndexerConstraint.js b/tests/baselines/reference/numericIndexerConstraint.js
index 38fe6b58d66a1..1b1851428e053 100644
--- a/tests/baselines/reference/numericIndexerConstraint.js
+++ b/tests/baselines/reference/numericIndexerConstraint.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/numericIndexerConstraint1.js b/tests/baselines/reference/numericIndexerConstraint1.js
index ed51e3af06611..1065f7d9dc885 100644
--- a/tests/baselines/reference/numericIndexerConstraint1.js
+++ b/tests/baselines/reference/numericIndexerConstraint1.js
@@ -10,6 +10,6 @@ var Foo = (function () {
     }
     Foo.prototype.foo = function () { };
     return Foo;
-})();
+}());
 var x;
 var result = x["one"]; // error
diff --git a/tests/baselines/reference/numericIndexerConstraint2.js b/tests/baselines/reference/numericIndexerConstraint2.js
index 4d8ce742e7350..a8063a2548d60 100644
--- a/tests/baselines/reference/numericIndexerConstraint2.js
+++ b/tests/baselines/reference/numericIndexerConstraint2.js
@@ -10,7 +10,7 @@ var Foo = (function () {
     }
     Foo.prototype.foo = function () { };
     return Foo;
-})();
+}());
 var x;
 var a;
 x = a;
diff --git a/tests/baselines/reference/numericIndexerConstraint3.js b/tests/baselines/reference/numericIndexerConstraint3.js
index dc3b6024eee3b..9f7a61fe30d0d 100644
--- a/tests/baselines/reference/numericIndexerConstraint3.js
+++ b/tests/baselines/reference/numericIndexerConstraint3.js
@@ -22,16 +22,16 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/numericIndexerConstraint4.js b/tests/baselines/reference/numericIndexerConstraint4.js
index 7509c64eac8cb..245569cb62ef7 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.js
+++ b/tests/baselines/reference/numericIndexerConstraint4.js
@@ -21,12 +21,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var x = { data: new B() };
diff --git a/tests/baselines/reference/numericIndexerTyping2.js b/tests/baselines/reference/numericIndexerTyping2.js
index 2e3ba2ce74c70..47fb46794f093 100644
--- a/tests/baselines/reference/numericIndexerTyping2.js
+++ b/tests/baselines/reference/numericIndexerTyping2.js
@@ -22,14 +22,14 @@ var I = (function () {
     function I() {
     }
     return I;
-})();
+}());
 var I2 = (function (_super) {
     __extends(I2, _super);
     function I2() {
         _super.apply(this, arguments);
     }
     return I2;
-})(I);
+}(I));
 var i;
 var r = i[1]; // error: numeric indexer returns the type of the string indexer
 var i2;
diff --git a/tests/baselines/reference/numericIndexingResults.js b/tests/baselines/reference/numericIndexingResults.js
index 70c6e15d15ae9..780bba3d498cb 100644
--- a/tests/baselines/reference/numericIndexingResults.js
+++ b/tests/baselines/reference/numericIndexingResults.js
@@ -63,7 +63,7 @@ var C = (function () {
         this["2"] = '';
     }
     return C;
-})();
+}());
 var c;
 var r1 = c['1'];
 var r2 = c['2'];
diff --git a/tests/baselines/reference/numericMethodName1.js b/tests/baselines/reference/numericMethodName1.js
index 294e5a1491b63..8f68d10cd376a 100644
--- a/tests/baselines/reference/numericMethodName1.js
+++ b/tests/baselines/reference/numericMethodName1.js
@@ -10,4 +10,4 @@ var C = (function () {
         this[1] = 2;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/numericNamedPropertyDuplicates.js b/tests/baselines/reference/numericNamedPropertyDuplicates.js
index e4340d629ead3..6c8af32931851 100644
--- a/tests/baselines/reference/numericNamedPropertyDuplicates.js
+++ b/tests/baselines/reference/numericNamedPropertyDuplicates.js
@@ -26,7 +26,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b = {
     2: 1,
diff --git a/tests/baselines/reference/numericStringNamedPropertyEquivalence.js b/tests/baselines/reference/numericStringNamedPropertyEquivalence.js
index 9f141f6dd1c41..a0f2268b98b81 100644
--- a/tests/baselines/reference/numericStringNamedPropertyEquivalence.js
+++ b/tests/baselines/reference/numericStringNamedPropertyEquivalence.js
@@ -30,7 +30,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b = {
     "0": '',
diff --git a/tests/baselines/reference/objectCreationExpressionInFunctionParameter.js b/tests/baselines/reference/objectCreationExpressionInFunctionParameter.js
index 55ac0c530e618..76e36420acafe 100644
--- a/tests/baselines/reference/objectCreationExpressionInFunctionParameter.js
+++ b/tests/baselines/reference/objectCreationExpressionInFunctionParameter.js
@@ -12,7 +12,7 @@ var A = (function () {
         this.a1 = a1;
     }
     return A;
-})();
+}());
 function foo(x) {
     if (x === void 0) { x = new A(123); }
 }
diff --git a/tests/baselines/reference/objectCreationOfElementAccessExpression.js b/tests/baselines/reference/objectCreationOfElementAccessExpression.js
index 05457a559e916..dce09972c8387 100644
--- a/tests/baselines/reference/objectCreationOfElementAccessExpression.js
+++ b/tests/baselines/reference/objectCreationOfElementAccessExpression.js
@@ -77,7 +77,7 @@ var Food = (function () {
         }
     };
     return Food;
-})();
+}());
 var MonsterFood = (function (_super) {
     __extends(MonsterFood, _super);
     function MonsterFood(name, flavor) {
@@ -85,7 +85,7 @@ var MonsterFood = (function (_super) {
         this.flavor = flavor;
     }
     return MonsterFood;
-})(Food);
+}(Food));
 var IceCream = (function (_super) {
     __extends(IceCream, _super);
     function IceCream(flavor) {
@@ -93,7 +93,7 @@ var IceCream = (function (_super) {
         this.flavor = flavor;
     }
     return IceCream;
-})(MonsterFood);
+}(MonsterFood));
 var Cookie = (function (_super) {
     __extends(Cookie, _super);
     function Cookie(flavor, isGlutenFree) {
@@ -102,7 +102,7 @@ var Cookie = (function (_super) {
         this.isGlutenFree = isGlutenFree;
     }
     return Cookie;
-})(MonsterFood);
+}(MonsterFood));
 var PetFood = (function (_super) {
     __extends(PetFood, _super);
     function PetFood(name, whereToBuy) {
@@ -110,7 +110,7 @@ var PetFood = (function (_super) {
         this.whereToBuy = whereToBuy;
     }
     return PetFood;
-})(Food);
+}(Food));
 var ExpensiveOrganicDogFood = (function (_super) {
     __extends(ExpensiveOrganicDogFood, _super);
     function ExpensiveOrganicDogFood(whereToBuy) {
@@ -118,7 +118,7 @@ var ExpensiveOrganicDogFood = (function (_super) {
         this.whereToBuy = whereToBuy;
     }
     return ExpensiveOrganicDogFood;
-})(PetFood);
+}(PetFood));
 var ExpensiveOrganicCatFood = (function (_super) {
     __extends(ExpensiveOrganicCatFood, _super);
     function ExpensiveOrganicCatFood(whereToBuy, containsFish) {
@@ -127,12 +127,12 @@ var ExpensiveOrganicCatFood = (function (_super) {
         this.containsFish = containsFish;
     }
     return ExpensiveOrganicCatFood;
-})(PetFood);
+}(PetFood));
 var Slug = (function () {
     function Slug() {
     }
     return Slug;
-})();
+}());
 // ElementAccessExpressions can only contain one expression.  There should be a parse error here.
 var foods = new PetFood[new IceCream('Mint chocolate chip'), Cookie('Chocolate chip', false), new Cookie('Peanut butter', true)];
 var foods2 = new PetFood[new IceCream('Mint chocolate chip'), Cookie('Chocolate chip', false), new Cookie('Peanut butter', true)];
diff --git a/tests/baselines/reference/objectIndexer.js b/tests/baselines/reference/objectIndexer.js
index 1e58f89501f5e..f5bf47e347554 100644
--- a/tests/baselines/reference/objectIndexer.js
+++ b/tests/baselines/reference/objectIndexer.js
@@ -23,5 +23,5 @@ define(["require", "exports"], function (require, exports) {
             this.listeners = {};
         }
         return Emitter;
-    })();
+    }());
 });
diff --git a/tests/baselines/reference/objectLitArrayDeclNoNew.js b/tests/baselines/reference/objectLitArrayDeclNoNew.js
index a52ff55fc4dcd..f4642a1d2f688 100644
--- a/tests/baselines/reference/objectLitArrayDeclNoNew.js
+++ b/tests/baselines/reference/objectLitArrayDeclNoNew.js
@@ -36,7 +36,7 @@ var Test;
             this.moo = 0;
         }
         return Gar;
-    })();
+    }());
     Test.Gar = Gar;
     function bug() {
         var state = null;
diff --git a/tests/baselines/reference/objectLiteralDeclarationGeneration1.js b/tests/baselines/reference/objectLiteralDeclarationGeneration1.js
index 39ea91daf8131..eacf9463abc9f 100644
--- a/tests/baselines/reference/objectLiteralDeclarationGeneration1.js
+++ b/tests/baselines/reference/objectLiteralDeclarationGeneration1.js
@@ -6,7 +6,7 @@ var y = (function () {
     function y() {
     }
     return y;
-})();
+}());
 
 
 //// [objectLiteralDeclarationGeneration1.d.ts]
diff --git a/tests/baselines/reference/objectMembersOnTypes.js b/tests/baselines/reference/objectMembersOnTypes.js
index f0c33e8d89790..88a97feb0f720 100644
--- a/tests/baselines/reference/objectMembersOnTypes.js
+++ b/tests/baselines/reference/objectMembersOnTypes.js
@@ -14,7 +14,7 @@ var AAA = (function () {
     function AAA() {
     }
     return AAA;
-})();
+}());
 var x;
 x.toString();
 var i;
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
index 5d30e0faecfe5..9c5bcfb8e2d43 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
@@ -64,20 +64,20 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function () {
     function C() {
     }
     C.prototype.valueOf = function () { };
     return C;
-})();
+}());
 var c;
 var r1 = c.valueOf();
 var r1b = c.data;
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObject.js b/tests/baselines/reference/objectTypeHidingMembersOfObject.js
index 291cc1858fddb..bae6b56ff38b3 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObject.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObject.js
@@ -34,7 +34,7 @@ var C = (function () {
     }
     C.prototype.valueOf = function () { };
     return C;
-})();
+}());
 var c;
 var r1 = c.valueOf();
 var i;
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js
index 5ae0c2fb1bb47..65fc548ed6e6d 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat.js
@@ -31,7 +31,7 @@ var C = (function () {
     }
     C.prototype.toString = function () { };
     return C;
-})();
+}());
 var c;
 o = c; // error
 c = o; // ok
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js
index 7a2b5e2ec2f7a..6898e69cedc03 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObjectAssignmentCompat2.js
@@ -31,7 +31,7 @@ var C = (function () {
     }
     C.prototype.toString = function () { return 1; };
     return C;
-})();
+}());
 var c;
 o = c; // error
 c = o; // error
diff --git a/tests/baselines/reference/objectTypePropertyAccess.js b/tests/baselines/reference/objectTypePropertyAccess.js
index 143439aaa047a..d7856f2a9783c 100644
--- a/tests/baselines/reference/objectTypePropertyAccess.js
+++ b/tests/baselines/reference/objectTypePropertyAccess.js
@@ -35,7 +35,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var r1 = c.toString();
 var r2 = c['toString']();
diff --git a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.js b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.js
index 4772fedf17b54..f3bc471f973b1 100644
--- a/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.js
+++ b/tests/baselines/reference/objectTypeWithDuplicateNumericProperty.js
@@ -39,7 +39,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b = {
     1: 1,
diff --git a/tests/baselines/reference/objectTypeWithNumericProperty.js b/tests/baselines/reference/objectTypeWithNumericProperty.js
index e6a9f3ac66691..0001bc40f2f33 100644
--- a/tests/baselines/reference/objectTypeWithNumericProperty.js
+++ b/tests/baselines/reference/objectTypeWithNumericProperty.js
@@ -49,7 +49,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var r1 = c[1];
 var r2 = c[1.1];
diff --git a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.js b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.js
index 8c4a89aab6854..09dbc24b5b57f 100644
--- a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.js
+++ b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty.js
@@ -19,7 +19,7 @@ var List = (function () {
     function List() {
     }
     return List;
-})();
+}());
 var list1 = new List();
 var list2 = new List();
 var list3 = new List();
diff --git a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.js b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.js
index cbb3032f00fa0..0f4451f28cf94 100644
--- a/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.js
+++ b/tests/baselines/reference/objectTypeWithRecursiveWrappedProperty2.js
@@ -19,7 +19,7 @@ var List = (function () {
     function List() {
     }
     return List;
-})();
+}());
 var list1 = new List();
 var list2 = new List();
 var list3 = new List();
diff --git a/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.js b/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.js
index 388c4009a740b..5aec3feb442e0 100644
--- a/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.js
+++ b/tests/baselines/reference/objectTypeWithRecursiveWrappedPropertyCheckedNominally.js
@@ -58,12 +58,12 @@ var List = (function () {
     function List() {
     }
     return List;
-})();
+}());
 var MyList = (function () {
     function MyList() {
     }
     return MyList;
-})();
+}());
 var list1 = new List();
 var list2 = new List();
 var myList1 = new MyList();
diff --git a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js
index 088a5b7f637f5..7aa60382c6e19 100644
--- a/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js
+++ b/tests/baselines/reference/objectTypeWithStringIndexerHidingObjectIndexer.js
@@ -40,7 +40,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var r2 = c[''];
 var i;
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js
index a52d74b9f2db3..3ff5817692b09 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.js
@@ -135,7 +135,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var r1 = c['0.1'];
 var r2 = c['.1'];
diff --git a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.js b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.js
index 5d7073db876ff..7188c12a9eea7 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.js
+++ b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.js
@@ -58,7 +58,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var r = c["   "];
 var r2 = c["    "];
diff --git a/tests/baselines/reference/objectTypesIdentity.js b/tests/baselines/reference/objectTypesIdentity.js
index 7eccee2365161..c357986fd8944 100644
--- a/tests/baselines/reference/objectTypesIdentity.js
+++ b/tests/baselines/reference/objectTypesIdentity.js
@@ -94,17 +94,17 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b = { foo: '' };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentity2.js b/tests/baselines/reference/objectTypesIdentity2.js
index 87057754cab86..b33485564eef5 100644
--- a/tests/baselines/reference/objectTypesIdentity2.js
+++ b/tests/baselines/reference/objectTypesIdentity2.js
@@ -71,17 +71,17 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var E;
 (function (E) {
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js
index 0c6952291f9cf..a3e1e4fa4444c 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.js
@@ -107,19 +107,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x) { return ''; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js
index 43473d88e0aff..3b6956435f9b4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.js
@@ -107,19 +107,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x) { return ''; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js
index 498867f0a02b3..a9909c7283ff8 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.js
@@ -107,19 +107,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x, y) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x, y) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x) { return ''; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js
index 54400ad81d116..3f72347a00f47 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.js
@@ -123,19 +123,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x) { return null; };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: function (x) { return ''; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js
index 91208da5b90c4..9acf62da71cc9 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.js
@@ -93,17 +93,17 @@ var A = (function () {
     function A(x) {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B(x) {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
 var a;
 function foo1(x) { }
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js
index 87067b6be280e..315e079d429bf 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.js
@@ -83,13 +83,13 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x) {
         return null;
     }
     return C;
-})();
+}());
 var a;
 var b = { new: function (x) { return ''; } }; // not a construct signature, function called new
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js
index c95159ed99762..a61bedfd52f23 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.js
@@ -83,13 +83,13 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x, y) {
         return null;
     }
     return C;
-})();
+}());
 var a;
 var b = { new: function (x) { return ''; } }; // not a construct signature, function called new
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js
index c8bed1a47abf5..2289665621c92 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.js
@@ -107,19 +107,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x) { return x; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js
index 6ef5d15fd982f..d6a61b8d304a8 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.js
@@ -107,19 +107,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x, y) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x, y) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x, y) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x, y) { return x; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js
index 2b83064afed2b..a1b383a70e309 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.js
@@ -111,19 +111,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x) { return ''; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js
index 1f9c5fa525641..fbcba9d121e12 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.js
@@ -123,25 +123,25 @@ var A = (function () {
     }
     A.prototype.foo = function (x, y) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x, y) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x, y) { return null; };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     D.prototype.foo = function (x, y) { return null; };
     return D;
-})();
+}());
 var a;
 var b = { foo: function (x, y) { return ''; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js
index 21106b56b0015..48131af3212f3 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.js
@@ -131,36 +131,36 @@ var One = (function () {
     function One() {
     }
     return One;
-})();
+}());
 var Two = (function () {
     function Two() {
     }
     return Two;
-})();
+}());
 var A = (function () {
     function A() {
     }
     A.prototype.foo = function (x, y) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x, y) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x, y) { return null; };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     D.prototype.foo = function (x, y) { return null; };
     return D;
-})();
+}());
 var a;
 var b = { foo: function (x, y) { return ''; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js
index 99188347d368f..43147c28f55a6 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.js
@@ -111,19 +111,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x) { return null; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js
index 10d72bde0b333..c3758bc6c08e5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.js
@@ -111,19 +111,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x) { return null; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js
index 5a20dfdecb64d..de6a4724cd707 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.js
@@ -107,19 +107,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x) { return x; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js
index ec9c786b8904b..c27f7095d16d2 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.js
@@ -107,19 +107,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x) { return x; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js
index a4af2bc820edd..327cc15eddbd7 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.js
@@ -111,19 +111,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x, y) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x, y) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x, y) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x, y) { return x; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js
index 28b2f978b5558..753548bc360e7 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.js
@@ -111,19 +111,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x, y) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x, y) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x, y) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x, y) { return x; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js
index de9b4859fa18f..da4bb20591bf9 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.js
@@ -111,19 +111,19 @@ var A = (function () {
     }
     A.prototype.foo = function (x, y) { return null; };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     B.prototype.foo = function (x, y) { return null; };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.prototype.foo = function (x, y) { return null; };
     return C;
-})();
+}());
 var a;
 var b = { foo: function (x, y) { return x; } };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js
index fdc67d4b84ab5..c15c53b9bf80d 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.js
@@ -84,13 +84,13 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x) {
         return null;
     }
     return C;
-})();
+}());
 var a;
 var b = { new: function (x) { return ''; } }; // not a construct signature, function called new
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js
index 11dcdf0a609c7..f8aff596dc9c5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.js
@@ -95,19 +95,19 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x, y) {
         return null;
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x, y) {
         return null;
     }
     return D;
-})();
+}());
 var a;
 var b = { new: function (x, y) { return ''; } }; // not a construct signature, function called new
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js
index 5c6f59eef247b..141aa86823b27 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.js
@@ -103,30 +103,30 @@ var One = (function () {
     function One() {
     }
     return One;
-})();
+}());
 var Two = (function () {
     function Two() {
     }
     return Two;
-})();
+}());
 var B = (function () {
     function B(x, y) {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x, y) {
         return null;
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x, y) {
         return null;
     }
     return D;
-})();
+}());
 var a;
 var b = { new: function (x, y) { return ''; } }; // not a construct signature, function called new
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js
index 556d1bcaee098..b651d368f334b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.js
@@ -91,13 +91,13 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x) {
         return null;
     }
     return C;
-})();
+}());
 var a;
 var b = { new: function (x) { return null; } }; // not a construct signature, function called new
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js
index 68c32cb0e71d6..ff7095c4ea1a1 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.js
@@ -87,13 +87,13 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x) {
         return null;
     }
     return C;
-})();
+}());
 var a;
 var b = { new: function (x) { return null; } }; // not a construct signature, function called new
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js
index 789e02d2d7bf7..314eb700c4b19 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.js
@@ -79,13 +79,13 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x) {
         return null;
     }
     return C;
-})();
+}());
 var a;
 var b = { new: function (x) { return x; } };
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js
index 5a501d05834ee..182cf8263b779 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.js
@@ -79,13 +79,13 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x) {
         return null;
     }
     return C;
-})();
+}());
 var a;
 var b = { new: function (x) { return new C(x); } };
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js
index 685a8441d97da..5c5dd26c33171 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.js
@@ -83,13 +83,13 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x, y) {
         return null;
     }
     return C;
-})();
+}());
 var a;
 var b = { new: function (x, y) { return new C(x, y); } }; // not a construct signature, function called new
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js
index f16d69acaa1c0..14b2ec3c0ca0a 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.js
@@ -83,13 +83,13 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x, y) {
         return null;
     }
     return C;
-})();
+}());
 var a;
 var b = { new: function (x, y) { return new C(x, y); } }; // not a construct signature, function called new
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js
index 25c628e9e15ee..ffc238cacae09 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.js
@@ -83,13 +83,13 @@ var B = (function () {
         return null;
     }
     return B;
-})();
+}());
 var C = (function () {
     function C(x, y) {
         return null;
     }
     return C;
-})();
+}());
 var a;
 var b = { new: function (x, y) { return new C(x, y); } }; // not a construct signature, function called new
 function foo1b(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
index e0f626ae0836a..c0bd423cd793e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
@@ -133,31 +133,31 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var PA = (function (_super) {
     __extends(PA, _super);
     function PA() {
         _super.apply(this, arguments);
     }
     return PA;
-})(A);
+}(A));
 var PB = (function (_super) {
     __extends(PB, _super);
     function PB() {
         _super.apply(this, arguments);
     }
     return PB;
-})(B);
+}(B));
 var a;
 var b = { foo: '' };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
index f0417a7ca237b..98c29e96a86d4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
@@ -136,43 +136,43 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var PA = (function (_super) {
     __extends(PA, _super);
     function PA() {
         _super.apply(this, arguments);
     }
     return PA;
-})(A);
+}(A));
 var PB = (function (_super) {
     __extends(PB, _super);
     function PB() {
         _super.apply(this, arguments);
     }
     return PB;
-})(B);
+}(B));
 var a;
 var b = { foo: null };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
index e147379055363..ea85b8b3c6786 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
@@ -133,31 +133,31 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var PA = (function (_super) {
     __extends(PA, _super);
     function PA() {
         _super.apply(this, arguments);
     }
     return PA;
-})(A);
+}(A));
 var PB = (function (_super) {
     __extends(PB, _super);
     function PB() {
         _super.apply(this, arguments);
     }
     return PB;
-})(B);
+}(B));
 var a;
 var b = { foo: '' };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithOptionality.js b/tests/baselines/reference/objectTypesIdentityWithOptionality.js
index 2a61cda1bb9e3..a45d474614a86 100644
--- a/tests/baselines/reference/objectTypesIdentityWithOptionality.js
+++ b/tests/baselines/reference/objectTypesIdentityWithOptionality.js
@@ -62,17 +62,17 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b = { foo: '' };
 function foo2(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates.js b/tests/baselines/reference/objectTypesIdentityWithPrivates.js
index bf4f80da15a59..7d6be5eaf8fbe 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.js
@@ -131,31 +131,31 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var PA = (function (_super) {
     __extends(PA, _super);
     function PA() {
         _super.apply(this, arguments);
     }
     return PA;
-})(A);
+}(A));
 var PB = (function (_super) {
     __extends(PB, _super);
     function PB() {
         _super.apply(this, arguments);
     }
     return PB;
-})(B);
+}(B));
 var a;
 var b = { foo: '' };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
index c8cd12cff309b..cb9c677f024ef 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
@@ -49,14 +49,14 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 function foo1(x) { }
 function foo2(x) { }
 function foo3(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates3.js b/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
index a812a1fc4bdd8..241fbcaf27e96 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
@@ -35,27 +35,27 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(C1);
+}(C1));
 var c1;
 c1; // Should succeed (private x originates in the same declaration)
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C4 = (function (_super) {
     __extends(C4, _super);
     function C4() {
         _super.apply(this, arguments);
     }
     return C4;
-})(C3);
+}(C3));
 var c3;
 c3; // Should fail (private x originates in the same declaration, but different types)
diff --git a/tests/baselines/reference/objectTypesIdentityWithPublics.js b/tests/baselines/reference/objectTypesIdentityWithPublics.js
index 7c36eb48f2cb1..0abc8a9b5cc62 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPublics.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPublics.js
@@ -94,17 +94,17 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b = { foo: '' };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
index 9cf9e99cb4b7f..c0578c2fba18b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
@@ -133,31 +133,31 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var PA = (function (_super) {
     __extends(PA, _super);
     function PA() {
         _super.apply(this, arguments);
     }
     return PA;
-})(A);
+}(A));
 var PB = (function (_super) {
     __extends(PB, _super);
     function PB() {
         _super.apply(this, arguments);
     }
     return PB;
-})(B);
+}(B));
 var a;
 var b = { foo: '' };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
index 84f3d04e7bfc7..0670d45a5a529 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
@@ -136,43 +136,43 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var PA = (function (_super) {
     __extends(PA, _super);
     function PA() {
         _super.apply(this, arguments);
     }
     return PA;
-})(A);
+}(A));
 var PB = (function (_super) {
     __extends(PB, _super);
     function PB() {
         _super.apply(this, arguments);
     }
     return PB;
-})(B);
+}(B));
 var a;
 var b = { foo: null };
 function foo1(x) { }
diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties.js b/tests/baselines/reference/objectTypesWithOptionalProperties.js
index c2177e6376245..98141c048dd0b 100644
--- a/tests/baselines/reference/objectTypesWithOptionalProperties.js
+++ b/tests/baselines/reference/objectTypesWithOptionalProperties.js
@@ -32,12 +32,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var b = {
     x: 1 // error
 };
diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties2.js b/tests/baselines/reference/objectTypesWithOptionalProperties2.js
index e5ffbf09c10ca..eabb1a153a6e6 100644
--- a/tests/baselines/reference/objectTypesWithOptionalProperties2.js
+++ b/tests/baselines/reference/objectTypesWithOptionalProperties2.js
@@ -34,13 +34,13 @@ var C = (function () {
     }
     C.prototype.x = ;
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     C2.prototype.x = ;
     return C2;
-})();
+}());
 var b = {
     x: function () { }, 1: // error
      // error
diff --git a/tests/baselines/reference/objectTypesWithPredefinedTypesAsName.js b/tests/baselines/reference/objectTypesWithPredefinedTypesAsName.js
index 650ceb664df10..6c3637e2d0e58 100644
--- a/tests/baselines/reference/objectTypesWithPredefinedTypesAsName.js
+++ b/tests/baselines/reference/objectTypesWithPredefinedTypesAsName.js
@@ -19,24 +19,24 @@ var any = (function () {
     function any() {
     }
     return any;
-})();
+}());
 var number = (function () {
     function number() {
     }
     return number;
-})();
+}());
 var boolean = (function () {
     function boolean() {
     }
     return boolean;
-})();
+}());
 var bool = (function () {
     function bool() {
     }
     return bool;
-})(); // not a predefined type anymore
+}()); // not a predefined type anymore
 var string = (function () {
     function string() {
     }
     return string;
-})();
+}());
diff --git a/tests/baselines/reference/objectTypesWithPredefinedTypesAsName2.js b/tests/baselines/reference/objectTypesWithPredefinedTypesAsName2.js
index 974744f18706b..571769008868b 100644
--- a/tests/baselines/reference/objectTypesWithPredefinedTypesAsName2.js
+++ b/tests/baselines/reference/objectTypesWithPredefinedTypesAsName2.js
@@ -9,5 +9,5 @@ var default_1 = (function () {
     function default_1() {
     }
     return default_1;
-})();
+}());
 void {}; // parse error unlike the others
diff --git a/tests/baselines/reference/optionalArgsWithDefaultValues.js b/tests/baselines/reference/optionalArgsWithDefaultValues.js
index 12ab7c9f330c8..b2bdc7a9a658c 100644
--- a/tests/baselines/reference/optionalArgsWithDefaultValues.js
+++ b/tests/baselines/reference/optionalArgsWithDefaultValues.js
@@ -26,7 +26,7 @@ var CCC = (function () {
         if (z === void 0) { z = 0; }
     };
     return CCC;
-})();
+}());
 var a = function (x) {
     if (x === void 0) { x = 0; }
     return 1;
diff --git a/tests/baselines/reference/optionalConstructorArgInSuper.js b/tests/baselines/reference/optionalConstructorArgInSuper.js
index e8b65ea5119ee..3e6a47b4de21a 100644
--- a/tests/baselines/reference/optionalConstructorArgInSuper.js
+++ b/tests/baselines/reference/optionalConstructorArgInSuper.js
@@ -21,14 +21,14 @@ var Base = (function () {
     }
     Base.prototype.foo = function (other) { };
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var d = new Derived(); // bug caused an error here, couldn't select overload
 var d2;
 d2.foo();
diff --git a/tests/baselines/reference/optionalParamArgsTest.js b/tests/baselines/reference/optionalParamArgsTest.js
index 0c5a5d82814c9..6d42c38f90738 100644
--- a/tests/baselines/reference/optionalParamArgsTest.js
+++ b/tests/baselines/reference/optionalParamArgsTest.js
@@ -157,7 +157,7 @@ var C1 = (function () {
         return C1M5A1 + C1M5A2;
     };
     return C1;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2(v2) {
@@ -165,7 +165,7 @@ var C2 = (function (_super) {
         _super.call(this, v2);
     }
     return C2;
-})(C1);
+}(C1));
 function F1() { return 0; }
 function F2(F2A1) { return F2A1; }
 function F3(F3A1, F3A2) {
diff --git a/tests/baselines/reference/optionalParamInOverride.js b/tests/baselines/reference/optionalParamInOverride.js
index 4a72953bdadba..f6ccdbe3fab16 100644
--- a/tests/baselines/reference/optionalParamInOverride.js
+++ b/tests/baselines/reference/optionalParamInOverride.js
@@ -18,7 +18,7 @@ var Z = (function () {
     }
     Z.prototype.func = function () { };
     return Z;
-})();
+}());
 var Y = (function (_super) {
     __extends(Y, _super);
     function Y() {
@@ -26,4 +26,4 @@ var Y = (function (_super) {
     }
     Y.prototype.func = function (value) { };
     return Y;
-})(Z);
+}(Z));
diff --git a/tests/baselines/reference/optionalPropertiesInClasses.js b/tests/baselines/reference/optionalPropertiesInClasses.js
index 24f52e9d76a63..0adbec827cf65 100644
--- a/tests/baselines/reference/optionalPropertiesInClasses.js
+++ b/tests/baselines/reference/optionalPropertiesInClasses.js
@@ -22,14 +22,14 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
diff --git a/tests/baselines/reference/optionalSetterParam.js b/tests/baselines/reference/optionalSetterParam.js
index 1632f33be9fe3..22cc2cdc06707 100644
--- a/tests/baselines/reference/optionalSetterParam.js
+++ b/tests/baselines/reference/optionalSetterParam.js
@@ -15,4 +15,4 @@ var foo = (function () {
         configurable: true
     });
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/out-flag.js b/tests/baselines/reference/out-flag.js
index 755703a12fe72..a8c689f9736d9 100644
--- a/tests/baselines/reference/out-flag.js
+++ b/tests/baselines/reference/out-flag.js
@@ -30,7 +30,7 @@ var MyClass = (function () {
         //
     };
     return MyClass;
-})();
+}());
 //# sourceMappingURL=out-flag.js.map
 
 //// [out-flag.d.ts]
diff --git a/tests/baselines/reference/out-flag.sourcemap.txt b/tests/baselines/reference/out-flag.sourcemap.txt
index 82989f69583e7..6bc04d8c453b2 100644
--- a/tests/baselines/reference/out-flag.sourcemap.txt
+++ b/tests/baselines/reference/out-flag.sourcemap.txt
@@ -160,7 +160,7 @@ sourceFile:out-flag.ts
 1->Emitted(13, 5) Source(16, 1) + SourceIndex(0)
 2 >Emitted(13, 19) Source(16, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/out-flag2.js b/tests/baselines/reference/out-flag2.js
index e2a30f169e371..6d452daca6611 100644
--- a/tests/baselines/reference/out-flag2.js
+++ b/tests/baselines/reference/out-flag2.js
@@ -12,12 +12,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 //# sourceMappingURL=c.js.map
 
 //// [c.d.ts]
diff --git a/tests/baselines/reference/out-flag2.sourcemap.txt b/tests/baselines/reference/out-flag2.sourcemap.txt
index 160e00bd28ecf..a4966bf9f823e 100644
--- a/tests/baselines/reference/out-flag2.sourcemap.txt
+++ b/tests/baselines/reference/out-flag2.sourcemap.txt
@@ -38,7 +38,7 @@ sourceFile:tests/cases/compiler/a.ts
 1->Emitted(4, 5) Source(2, 11) + SourceIndex(0)
 2 >Emitted(4, 13) Source(2, 12) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -86,7 +86,7 @@ sourceFile:tests/cases/compiler/b.ts
 1->Emitted(9, 5) Source(1, 11) + SourceIndex(1)
 2 >Emitted(9, 13) Source(1, 12) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/out-flag3.js b/tests/baselines/reference/out-flag3.js
index 8327c3429d3ae..134bbfa9e0354 100644
--- a/tests/baselines/reference/out-flag3.js
+++ b/tests/baselines/reference/out-flag3.js
@@ -15,12 +15,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 //# sourceMappingURL=c.js.map
 
 //// [c.d.ts]
diff --git a/tests/baselines/reference/out-flag3.sourcemap.txt b/tests/baselines/reference/out-flag3.sourcemap.txt
index a14ca70e61756..8801fd1114323 100644
--- a/tests/baselines/reference/out-flag3.sourcemap.txt
+++ b/tests/baselines/reference/out-flag3.sourcemap.txt
@@ -48,7 +48,7 @@ sourceFile:tests/cases/compiler/a.ts
 1->Emitted(5, 5) Source(4, 11) + SourceIndex(0)
 2 >Emitted(5, 13) Source(4, 12) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -96,7 +96,7 @@ sourceFile:tests/cases/compiler/b.ts
 1->Emitted(10, 5) Source(1, 11) + SourceIndex(1)
 2 >Emitted(10, 13) Source(1, 12) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js
index 6408511f2ec91..8a478e675c69e 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -20,7 +20,7 @@ define("ref/a", ["require", "exports"], function (require, exports) {
         function A() {
         }
         return A;
-    })();
+    }());
     exports.A = A;
 });
 define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
@@ -31,7 +31,7 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
             _super.apply(this, arguments);
         }
         return B;
-    })(a_1.A);
+    }(a_1.A));
     exports.B = B;
 });
 //# sourceMappingURL=all.js.map
diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map
index 963fba4a8479d..5c34fd866a494 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js.map
+++ b/tests/baselines/reference/outModuleConcatAmd.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;;;;ICAlB;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;;;;ICAlB;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,SAAC,IAAc,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
index b8fe92f082ce0..76370d95c3229 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -45,7 +45,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1->Emitted(11, 9) Source(2, 18) + SourceIndex(0)
 2 >Emitted(11, 17) Source(2, 19) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -127,25 +127,25 @@ sourceFile:tests/cases/compiler/b.ts
 1->Emitted(22, 9) Source(2, 28) + SourceIndex(1)
 2 >Emitted(22, 17) Source(2, 29) + SourceIndex(1)
 ---
->>>    })(a_1.A);
+>>>    }(a_1.A));
 1 >^^^^
 2 >    ^
 3 >     
-4 >     ^^
-5 >       ^^^^^
-6 >            ^^
+4 >     ^
+5 >      ^^^^^
+6 >           ^^^
 7 >              ^^^^^->
 1 >
 2 >    }
 3 >     
 4 >     export class B extends 
-5 >       A
-6 >             { }
+5 >      A
+6 >            { }
 1 >Emitted(23, 5) Source(2, 28) + SourceIndex(1)
 2 >Emitted(23, 6) Source(2, 29) + SourceIndex(1)
 3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1)
-4 >Emitted(23, 8) Source(2, 24) + SourceIndex(1)
-5 >Emitted(23, 13) Source(2, 25) + SourceIndex(1)
+4 >Emitted(23, 7) Source(2, 24) + SourceIndex(1)
+5 >Emitted(23, 12) Source(2, 25) + SourceIndex(1)
 6 >Emitted(23, 15) Source(2, 29) + SourceIndex(1)
 ---
 >>>    exports.B = B;
diff --git a/tests/baselines/reference/outModuleConcatSystem.js b/tests/baselines/reference/outModuleConcatSystem.js
index 5ac811ea9a0e4..d4552d331673f 100644
--- a/tests/baselines/reference/outModuleConcatSystem.js
+++ b/tests/baselines/reference/outModuleConcatSystem.js
@@ -24,7 +24,7 @@ System.register("ref/a", [], function(exports_1) {
                 function A() {
                 }
                 return A;
-            })();
+            }());
             exports_1("A", A);
         }
     }
@@ -45,7 +45,7 @@ System.register("b", ["ref/a"], function(exports_2) {
                     _super.apply(this, arguments);
                 }
                 return B;
-            })(a_1.A);
+            }(a_1.A));
             exports_2("B", B);
         }
     }
diff --git a/tests/baselines/reference/outModuleConcatSystem.js.map b/tests/baselines/reference/outModuleConcatSystem.js.map
index c2289af1df454..47d3ba2d39c98 100644
--- a/tests/baselines/reference/outModuleConcatSystem.js.map
+++ b/tests/baselines/reference/outModuleConcatSystem.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;YACA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;;YCAlB;gBAAuB,qBAAC;gBAAxB;oBAAuB,8BAAC;gBAAG,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,EAAuB,KAAC,EAAI;YAA5B,iBAA4B,CAAA"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;YACA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;;YCAlB;gBAAuB,qBAAC;gBAAxB;oBAAuB,8BAAC;gBAAG,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;YAA5B,iBAA4B,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
index 88ff65a88a399..e3f521c828c69 100644
--- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
@@ -49,7 +49,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1->Emitted(15, 17) Source(2, 18) + SourceIndex(0)
 2 >Emitted(15, 25) Source(2, 19) + SourceIndex(0)
 ---
->>>            })();
+>>>            }());
 1 >^^^^^^^^^^^^
 2 >            ^
 3 >             
@@ -138,25 +138,25 @@ sourceFile:tests/cases/compiler/b.ts
 1->Emitted(36, 17) Source(2, 28) + SourceIndex(1)
 2 >Emitted(36, 25) Source(2, 29) + SourceIndex(1)
 ---
->>>            })(a_1.A);
+>>>            }(a_1.A));
 1 >^^^^^^^^^^^^
 2 >            ^
 3 >             
-4 >             ^^
-5 >               ^^^^^
-6 >                    ^^
+4 >             ^
+5 >              ^^^^^
+6 >                   ^^^
 7 >                      ^^^^^^^^^->
 1 >
 2 >            }
 3 >             
 4 >             export class B extends 
-5 >               A
-6 >                     { }
+5 >              A
+6 >                    { }
 1 >Emitted(37, 13) Source(2, 28) + SourceIndex(1)
 2 >Emitted(37, 14) Source(2, 29) + SourceIndex(1)
 3 >Emitted(37, 14) Source(2, 1) + SourceIndex(1)
-4 >Emitted(37, 16) Source(2, 24) + SourceIndex(1)
-5 >Emitted(37, 21) Source(2, 25) + SourceIndex(1)
+4 >Emitted(37, 15) Source(2, 24) + SourceIndex(1)
+5 >Emitted(37, 20) Source(2, 25) + SourceIndex(1)
 6 >Emitted(37, 23) Source(2, 29) + SourceIndex(1)
 ---
 >>>            exports_2("B", B);
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js
index 0aabf2b483513..90f8feab7bc52 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -41,7 +41,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 define("ref/a", ["require", "exports"], function (require, exports) {
     "use strict";
     /// <reference path="./b.ts" />
@@ -49,7 +49,7 @@ define("ref/a", ["require", "exports"], function (require, exports) {
         function A() {
         }
         return A;
-    })();
+    }());
     exports.A = A;
 });
 define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
@@ -60,7 +60,7 @@ define("b", ["require", "exports", "ref/a"], function (require, exports, a_1) {
             _super.apply(this, arguments);
         }
         return B;
-    })(a_1.A);
+    }(a_1.A));
     exports.B = B;
 });
 //# sourceMappingURL=all.js.map
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
index 324f0e9374f95..7d0c11de99cad 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js.map
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,SAAC,IAEb,CAAA;;;;ICHD;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}
\ No newline at end of file
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,SAAC,IAEb,CAAA;;;;ICHD;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,SAAC,IAAc,CAAA"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
index b80246ed9f7fa..a689c611ef051 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -53,7 +53,7 @@ sourceFile:tests/cases/compiler/ref/b.ts
 1->Emitted(10, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(10, 15) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -117,7 +117,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1->Emitted(18, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(18, 17) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -203,25 +203,25 @@ sourceFile:tests/cases/compiler/b.ts
 1->Emitted(29, 9) Source(2, 28) + SourceIndex(2)
 2 >Emitted(29, 17) Source(2, 29) + SourceIndex(2)
 ---
->>>    })(a_1.A);
+>>>    }(a_1.A));
 1 >^^^^
 2 >    ^
 3 >     
-4 >     ^^
-5 >       ^^^^^
-6 >            ^^
+4 >     ^
+5 >      ^^^^^
+6 >           ^^^
 7 >              ^^^^^->
 1 >
 2 >    }
 3 >     
 4 >     export class B extends 
-5 >       A
-6 >             { }
+5 >      A
+6 >            { }
 1 >Emitted(30, 5) Source(2, 28) + SourceIndex(2)
 2 >Emitted(30, 6) Source(2, 29) + SourceIndex(2)
 3 >Emitted(30, 6) Source(2, 1) + SourceIndex(2)
-4 >Emitted(30, 8) Source(2, 24) + SourceIndex(2)
-5 >Emitted(30, 13) Source(2, 25) + SourceIndex(2)
+4 >Emitted(30, 7) Source(2, 24) + SourceIndex(2)
+5 >Emitted(30, 12) Source(2, 25) + SourceIndex(2)
 6 >Emitted(30, 15) Source(2, 29) + SourceIndex(2)
 ---
 >>>    exports.B = B;
diff --git a/tests/baselines/reference/overload1.js b/tests/baselines/reference/overload1.js
index af3aebde4ee06..fd05873c64795 100644
--- a/tests/baselines/reference/overload1.js
+++ b/tests/baselines/reference/overload1.js
@@ -51,7 +51,7 @@ var O;
         function A() {
         }
         return A;
-    })();
+    }());
     O.A = A;
     var B = (function (_super) {
         __extends(B, _super);
@@ -59,7 +59,7 @@ var O;
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     O.B = B;
     var C = (function (_super) {
         __extends(C, _super);
@@ -67,7 +67,7 @@ var O;
             _super.apply(this, arguments);
         }
         return C;
-    })(B);
+    }(B));
     O.C = C;
 })(O || (O = {}));
 var e = x.g(new O.A()); // matches overload but bad assignment
diff --git a/tests/baselines/reference/overload2.js b/tests/baselines/reference/overload2.js
index 70d950e5420f9..667d0fb1db406 100644
--- a/tests/baselines/reference/overload2.js
+++ b/tests/baselines/reference/overload2.js
@@ -30,7 +30,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 // should be ok
 function foo1(x) {
 }
diff --git a/tests/baselines/reference/overloadAssignmentCompat.js b/tests/baselines/reference/overloadAssignmentCompat.js
index 2d4bd931844ce..7915edd544602 100644
--- a/tests/baselines/reference/overloadAssignmentCompat.js
+++ b/tests/baselines/reference/overloadAssignmentCompat.js
@@ -44,7 +44,7 @@ var Accessor = (function () {
     function Accessor() {
     }
     return Accessor;
-})();
+}());
 function attr(nameOrMap, value) {
     if (nameOrMap && typeof nameOrMap === "object") {
         // handle map case
diff --git a/tests/baselines/reference/overloadCallTest.js b/tests/baselines/reference/overloadCallTest.js
index 38930b7aea31e..369c68923dfb1 100644
--- a/tests/baselines/reference/overloadCallTest.js
+++ b/tests/baselines/reference/overloadCallTest.js
@@ -25,4 +25,4 @@ var foo = (function () {
         goo = bar("test");
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/overloadConsecutiveness.js b/tests/baselines/reference/overloadConsecutiveness.js
index 8c0d3d26b7286..68e478a30b511 100644
--- a/tests/baselines/reference/overloadConsecutiveness.js
+++ b/tests/baselines/reference/overloadConsecutiveness.js
@@ -24,4 +24,4 @@ var C = (function () {
     C.prototype.m2 = function () { };
     C.prototype.m3 = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/overloadEquivalenceWithStatics.js b/tests/baselines/reference/overloadEquivalenceWithStatics.js
index 72692c4d89f46..4c296410aa6d4 100644
--- a/tests/baselines/reference/overloadEquivalenceWithStatics.js
+++ b/tests/baselines/reference/overloadEquivalenceWithStatics.js
@@ -16,4 +16,4 @@ var A1 = (function () {
         return null;
     };
     return A1;
-})();
+}());
diff --git a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js
index c4b133ea44c48..356cece5ab6e3 100644
--- a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js
+++ b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.js
@@ -15,12 +15,12 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 function Choice() {
     var v_args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
diff --git a/tests/baselines/reference/overloadModifiersMustAgree.js b/tests/baselines/reference/overloadModifiersMustAgree.js
index afcc0f829c891..e7256562e76eb 100644
--- a/tests/baselines/reference/overloadModifiersMustAgree.js
+++ b/tests/baselines/reference/overloadModifiersMustAgree.js
@@ -22,5 +22,5 @@ var baz = (function () {
     }
     baz.prototype.foo = function (bar) { }; // error - access modifiers do not agree
     return baz;
-})();
+}());
 function bar(s) { }
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks1.js b/tests/baselines/reference/overloadOnConstConstraintChecks1.js
index 67aa365ee398f..a3b7a32986150 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks1.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.js
@@ -33,7 +33,7 @@ var Base = (function () {
     }
     Base.prototype.foo = function () { };
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
@@ -41,7 +41,7 @@ var Derived1 = (function (_super) {
     }
     Derived1.prototype.bar = function () { };
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
@@ -49,7 +49,7 @@ var Derived2 = (function (_super) {
     }
     Derived2.prototype.baz = function () { };
     return Derived2;
-})(Base);
+}(Base));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3() {
@@ -57,7 +57,7 @@ var Derived3 = (function (_super) {
     }
     Derived3.prototype.biz = function () { };
     return Derived3;
-})(Base);
+}(Base));
 var D = (function () {
     function D() {
     }
@@ -65,4 +65,4 @@ var D = (function () {
         return null;
     };
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks2.js b/tests/baselines/reference/overloadOnConstConstraintChecks2.js
index 353680bb92e03..efb57153b13a6 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.js
@@ -21,14 +21,14 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -36,7 +36,7 @@ var C = (function (_super) {
     }
     C.prototype.foo = function () { };
     return C;
-})(A);
+}(A));
 function foo(name) {
     return null;
 }
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks3.js b/tests/baselines/reference/overloadOnConstConstraintChecks3.js
index 2debaa589f5e2..181f9d8129c50 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.js
@@ -23,14 +23,14 @@ var A = (function () {
         this.x = 1;
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -38,7 +38,7 @@ var C = (function (_super) {
     }
     C.prototype.foo = function () { };
     return C;
-})(A);
+}(A));
 function foo(name) {
     return null;
 }
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.js b/tests/baselines/reference/overloadOnConstConstraintChecks4.js
index 17ec3779620bd..10733fa8ea3a7 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks4.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.js
@@ -23,7 +23,7 @@ var Z = (function () {
     function Z() {
     }
     return Z;
-})();
+}());
 var A = (function (_super) {
     __extends(A, _super);
     function A() {
@@ -31,14 +31,14 @@ var A = (function (_super) {
         this.x = 1;
     }
     return A;
-})(Z);
+}(Z));
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -46,7 +46,7 @@ var C = (function (_super) {
     }
     C.prototype.foo = function () { };
     return C;
-})(A);
+}(A));
 function foo(name) {
     return null;
 }
diff --git a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.js b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.js
index 1b6062e7b2163..188e4d0214023 100644
--- a/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.js
+++ b/tests/baselines/reference/overloadOnConstInBaseWithBadImplementationInDerived.js
@@ -15,4 +15,4 @@ var C = (function () {
     C.prototype.x1 = function (a, callback) {
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/overloadOnConstInCallback1.js b/tests/baselines/reference/overloadOnConstInCallback1.js
index 90bffd4e75cab..d00779081774d 100644
--- a/tests/baselines/reference/overloadOnConstInCallback1.js
+++ b/tests/baselines/reference/overloadOnConstInCallback1.js
@@ -20,4 +20,4 @@ var C = (function () {
         callback(hm);
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/overloadOnConstInheritance4.js b/tests/baselines/reference/overloadOnConstInheritance4.js
index 7bfad88a7a7e9..f493d9ef2de0f 100644
--- a/tests/baselines/reference/overloadOnConstInheritance4.js
+++ b/tests/baselines/reference/overloadOnConstInheritance4.js
@@ -16,4 +16,4 @@ var C = (function () {
     C.prototype.x1 = function (a, callback) {
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js
index 52f6639e35218..5e3110abd3dd3 100644
--- a/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js
+++ b/tests/baselines/reference/overloadOnConstNoAnyImplementation2.js
@@ -33,7 +33,7 @@ var C = (function () {
         callback(1); // error
     };
     return C;
-})();
+}());
 var c;
 c.x1(1, function (x) { return 1; });
 c.x1(1, function (x) { return 1; });
diff --git a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.js b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.js
index 980dfcb214528..8a610f30922aa 100644
--- a/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.js
+++ b/tests/baselines/reference/overloadOnConstNoNonSpecializedSignature.js
@@ -11,4 +11,4 @@ var C = (function () {
     }
     C.prototype.x1 = function (a) { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/overloadOnConstNoStringImplementation2.js b/tests/baselines/reference/overloadOnConstNoStringImplementation2.js
index 71d7a4e4a3f66..98ee0f45c152d 100644
--- a/tests/baselines/reference/overloadOnConstNoStringImplementation2.js
+++ b/tests/baselines/reference/overloadOnConstNoStringImplementation2.js
@@ -32,7 +32,7 @@ var C = (function () {
         callback(1);
     };
     return C;
-})();
+}());
 var c;
 c.x1(1, function (x) { return 1; });
 c.x1(1, function (x) { return 1; });
diff --git a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
index a8dfcde9ada34..c98075c04a180 100644
--- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
+++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
@@ -22,7 +22,7 @@ var Base = (function () {
     }
     Base.prototype.foo = function () { };
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
@@ -30,7 +30,7 @@ var Derived1 = (function (_super) {
     }
     Derived1.prototype.bar = function () { };
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
@@ -38,7 +38,7 @@ var Derived2 = (function (_super) {
     }
     Derived2.prototype.baz = function () { };
     return Derived2;
-})(Base);
+}(Base));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3() {
@@ -46,7 +46,7 @@ var Derived3 = (function (_super) {
     }
     Derived3.prototype.biz = function () { };
     return Derived3;
-})(Base);
+}(Base));
 function foo(name) {
     return null;
 }
diff --git a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.js b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.js
index d88cd2bceb8be..d7f992564db44 100644
--- a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.js
+++ b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.js
@@ -21,32 +21,32 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 var X1 = (function () {
     function X1() {
     }
     return X1;
-})();
+}());
 var X2 = (function () {
     function X2() {
     }
     return X2;
-})();
+}());
 function f(a) {
 }
 var xs;
diff --git a/tests/baselines/reference/overloadResolution.js b/tests/baselines/reference/overloadResolution.js
index 287c5ccdb8ee8..0d25322fdfcd8 100644
--- a/tests/baselines/reference/overloadResolution.js
+++ b/tests/baselines/reference/overloadResolution.js
@@ -104,28 +104,28 @@ var SomeBase = (function () {
     function SomeBase() {
     }
     return SomeBase;
-})();
+}());
 var SomeDerived1 = (function (_super) {
     __extends(SomeDerived1, _super);
     function SomeDerived1() {
         _super.apply(this, arguments);
     }
     return SomeDerived1;
-})(SomeBase);
+}(SomeBase));
 var SomeDerived2 = (function (_super) {
     __extends(SomeDerived2, _super);
     function SomeDerived2() {
         _super.apply(this, arguments);
     }
     return SomeDerived2;
-})(SomeBase);
+}(SomeBase));
 var SomeDerived3 = (function (_super) {
     __extends(SomeDerived3, _super);
     function SomeDerived3() {
         _super.apply(this, arguments);
     }
     return SomeDerived3;
-})(SomeBase);
+}(SomeBase));
 function fn1() { return null; }
 var s = fn1(undefined);
 var s;
diff --git a/tests/baselines/reference/overloadResolutionClassConstructors.js b/tests/baselines/reference/overloadResolutionClassConstructors.js
index 14306b7873b1b..9fa55fe1e95a1 100644
--- a/tests/baselines/reference/overloadResolutionClassConstructors.js
+++ b/tests/baselines/reference/overloadResolutionClassConstructors.js
@@ -111,34 +111,34 @@ var SomeBase = (function () {
     function SomeBase() {
     }
     return SomeBase;
-})();
+}());
 var SomeDerived1 = (function (_super) {
     __extends(SomeDerived1, _super);
     function SomeDerived1() {
         _super.apply(this, arguments);
     }
     return SomeDerived1;
-})(SomeBase);
+}(SomeBase));
 var SomeDerived2 = (function (_super) {
     __extends(SomeDerived2, _super);
     function SomeDerived2() {
         _super.apply(this, arguments);
     }
     return SomeDerived2;
-})(SomeBase);
+}(SomeBase));
 var SomeDerived3 = (function (_super) {
     __extends(SomeDerived3, _super);
     function SomeDerived3() {
         _super.apply(this, arguments);
     }
     return SomeDerived3;
-})(SomeBase);
+}(SomeBase));
 // Ambiguous call picks the first overload in declaration order
 var fn1 = (function () {
     function fn1() {
     }
     return fn1;
-})();
+}());
 new fn1(undefined);
 // No candidate overloads found
 new fn1({}); // Error
@@ -147,7 +147,7 @@ var fn2 = (function () {
     function fn2() {
     }
     return fn2;
-})();
+}());
 var d = new fn2(0, undefined);
 // Generic and non - generic overload where generic overload is the only candidate when called without type arguments
 var s = new fn2(0, '');
@@ -160,7 +160,7 @@ var fn3 = (function () {
     function fn3() {
     }
     return fn3;
-})();
+}());
 new fn3(3);
 new fn3('', 3, '');
 new fn3(5, 5, 5);
@@ -175,7 +175,7 @@ var fn4 = (function () {
     function fn4() {
     }
     return fn4;
-})();
+}());
 new fn4('', 3);
 new fn4(3, ''); // Error
 new fn4('', 3); // Error
@@ -196,7 +196,7 @@ var fn5 = (function () {
         return undefined;
     }
     return fn5;
-})();
+}());
 new fn5(function (n) { return n.toFixed(); });
 new fn5(function (n) { return n.substr(0); });
 new fn5(function (n) { return n.blah; }); // Error
diff --git a/tests/baselines/reference/overloadResolutionConstructors.js b/tests/baselines/reference/overloadResolutionConstructors.js
index 788e6362f86f8..12d8480eefb3c 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.js
+++ b/tests/baselines/reference/overloadResolutionConstructors.js
@@ -112,28 +112,28 @@ var SomeBase = (function () {
     function SomeBase() {
     }
     return SomeBase;
-})();
+}());
 var SomeDerived1 = (function (_super) {
     __extends(SomeDerived1, _super);
     function SomeDerived1() {
         _super.apply(this, arguments);
     }
     return SomeDerived1;
-})(SomeBase);
+}(SomeBase));
 var SomeDerived2 = (function (_super) {
     __extends(SomeDerived2, _super);
     function SomeDerived2() {
         _super.apply(this, arguments);
     }
     return SomeDerived2;
-})(SomeBase);
+}(SomeBase));
 var SomeDerived3 = (function (_super) {
     __extends(SomeDerived3, _super);
     function SomeDerived3() {
         _super.apply(this, arguments);
     }
     return SomeDerived3;
-})(SomeBase);
+}(SomeBase));
 var fn1;
 // Ambiguous call picks the first overload in declaration order
 var s = new fn1(undefined);
diff --git a/tests/baselines/reference/overloadResolutionOnDefaultConstructor1.js b/tests/baselines/reference/overloadResolutionOnDefaultConstructor1.js
index 3c7f6bc760909..49ac12e615223 100644
--- a/tests/baselines/reference/overloadResolutionOnDefaultConstructor1.js
+++ b/tests/baselines/reference/overloadResolutionOnDefaultConstructor1.js
@@ -13,4 +13,4 @@ var Bar = (function () {
         return new Bar(0);
     };
     return Bar;
-})();
+}());
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js
index 170f2dd2137cd..210e45c27d679 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js
+++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.js
@@ -30,7 +30,7 @@ var Bugs;
         function A() {
         }
         return A;
-    })();
+    }());
     // replace(searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string;
     function bug2(message) {
         var args = [];
diff --git a/tests/baselines/reference/overloadReturnTypes.js b/tests/baselines/reference/overloadReturnTypes.js
index 127063caaaecd..9a49a550f40e9 100644
--- a/tests/baselines/reference/overloadReturnTypes.js
+++ b/tests/baselines/reference/overloadReturnTypes.js
@@ -28,7 +28,7 @@ var Accessor = (function () {
     function Accessor() {
     }
     return Accessor;
-})();
+}());
 function attr(nameOrMap, value) {
     if (nameOrMap && typeof nameOrMap === "object") {
         // handle map case
diff --git a/tests/baselines/reference/overloadedStaticMethodSpecialization.js b/tests/baselines/reference/overloadedStaticMethodSpecialization.js
index db50cbc992c0a..d63b185419a00 100644
--- a/tests/baselines/reference/overloadedStaticMethodSpecialization.js
+++ b/tests/baselines/reference/overloadedStaticMethodSpecialization.js
@@ -16,4 +16,4 @@ var A = (function () {
         return null;
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/overloadingOnConstants1.js b/tests/baselines/reference/overloadingOnConstants1.js
index bd08f70498dee..b261201be40d9 100644
--- a/tests/baselines/reference/overloadingOnConstants1.js
+++ b/tests/baselines/reference/overloadingOnConstants1.js
@@ -36,7 +36,7 @@ var Base = (function () {
     }
     Base.prototype.foo = function () { };
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
@@ -44,7 +44,7 @@ var Derived1 = (function (_super) {
     }
     Derived1.prototype.bar = function () { };
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
@@ -52,7 +52,7 @@ var Derived2 = (function (_super) {
     }
     Derived2.prototype.baz = function () { };
     return Derived2;
-})(Base);
+}(Base));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3() {
@@ -60,7 +60,7 @@ var Derived3 = (function (_super) {
     }
     Derived3.prototype.biz = function () { };
     return Derived3;
-})(Base);
+}(Base));
 var d2;
 // these are ok
 var htmlElement = d2.createElement("yo");
diff --git a/tests/baselines/reference/overloadingOnConstants2.js b/tests/baselines/reference/overloadingOnConstants2.js
index eaec0054f6696..977ae7ec5b9ad 100644
--- a/tests/baselines/reference/overloadingOnConstants2.js
+++ b/tests/baselines/reference/overloadingOnConstants2.js
@@ -38,20 +38,20 @@ var C = (function () {
         this.x = 1;
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 var E = (function () {
     function E() {
         this.y = 1;
     }
     return E;
-})();
+}());
 function foo(x, items) {
     return null;
 }
diff --git a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js
index 63b4a2b1e931c..b5ddd0adebc97 100644
--- a/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js
+++ b/tests/baselines/reference/overloadresolutionWithConstraintCheckingDeferred.js
@@ -27,7 +27,7 @@ var G = (function () {
     function G(x) {
     }
     return G;
-})();
+}());
 var result = foo(function (x) { return new G(x); }); // x has type D, new G(x) fails, so first overload is picked.
 var result2 = foo(function (x) { return new G(x); }); // x has type D, new G(x) fails, so first overload is picked.
 var result3 = foo(function (x) {
diff --git a/tests/baselines/reference/overloadsWithinClasses.js b/tests/baselines/reference/overloadsWithinClasses.js
index 4ac612502c73b..0cd191c8f4437 100644
--- a/tests/baselines/reference/overloadsWithinClasses.js
+++ b/tests/baselines/reference/overloadsWithinClasses.js
@@ -30,17 +30,17 @@ var foo = (function () {
     foo.fnOverload = function () { };
     foo.fnOverload = function (foo) { }; // error
     return foo;
-})();
+}());
 var bar = (function () {
     function bar() {
     }
     bar.fnOverload = function (foo) { }; // no error
     return bar;
-})();
+}());
 var X = (function () {
     function X() {
     }
     X.prototype.attr = function (first, second) {
     };
     return X;
-})();
+}());
diff --git a/tests/baselines/reference/overridingPrivateStaticMembers.js b/tests/baselines/reference/overridingPrivateStaticMembers.js
index a155bb1b83054..ddd9fae642989 100644
--- a/tests/baselines/reference/overridingPrivateStaticMembers.js
+++ b/tests/baselines/reference/overridingPrivateStaticMembers.js
@@ -17,11 +17,11 @@ var Base2 = (function () {
     function Base2() {
     }
     return Base2;
-})();
+}());
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base2);
+}(Base2));
diff --git a/tests/baselines/reference/paramPropertiesInSignatures.js b/tests/baselines/reference/paramPropertiesInSignatures.js
index 15d7f616bdf6f..690052e589b2c 100644
--- a/tests/baselines/reference/paramPropertiesInSignatures.js
+++ b/tests/baselines/reference/paramPropertiesInSignatures.js
@@ -17,4 +17,4 @@ var C1 = (function () {
         this.p3 = p3;
     } // OK
     return C1;
-})();
+}());
diff --git a/tests/baselines/reference/parameterInitializersForwardReferencing.js b/tests/baselines/reference/parameterInitializersForwardReferencing.js
index 188a104f3af9d..e43ba42fbb8c8 100644
--- a/tests/baselines/reference/parameterInitializersForwardReferencing.js
+++ b/tests/baselines/reference/parameterInitializersForwardReferencing.js
@@ -91,7 +91,7 @@ var C = (function () {
         if (b === void 0) { b = 1; }
     };
     return C;
-})();
+}());
 // Function expressions
 var x = function (a, b, c) {
     if (a === void 0) { a = b; }
diff --git a/tests/baselines/reference/parameterNamesInTypeParameterList.js b/tests/baselines/reference/parameterNamesInTypeParameterList.js
index 2fbd7fad3cb05..f4d74b89782f1 100644
--- a/tests/baselines/reference/parameterNamesInTypeParameterList.js
+++ b/tests/baselines/reference/parameterNamesInTypeParameterList.js
@@ -50,4 +50,4 @@ var A = (function () {
         a.b;
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/parameterPropertyInConstructor2.js b/tests/baselines/reference/parameterPropertyInConstructor2.js
index 595f3f3d0ffe5..23e891ce384a6 100644
--- a/tests/baselines/reference/parameterPropertyInConstructor2.js
+++ b/tests/baselines/reference/parameterPropertyInConstructor2.js
@@ -17,5 +17,5 @@ var mod;
             this.ages = ages;
         }
         return Customers;
-    })();
+    }());
 })(mod || (mod = {}));
diff --git a/tests/baselines/reference/parameterPropertyInitializerInInitializers.js b/tests/baselines/reference/parameterPropertyInitializerInInitializers.js
index d3cd88764f40a..a689ab2df79d7 100644
--- a/tests/baselines/reference/parameterPropertyInitializerInInitializers.js
+++ b/tests/baselines/reference/parameterPropertyInitializerInInitializers.js
@@ -11,4 +11,4 @@ var Foo = (function () {
         this.y = y;
     }
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/parameterPropertyOutsideConstructor.js b/tests/baselines/reference/parameterPropertyOutsideConstructor.js
index 43e20d4fa6397..151b766cf5dc1 100644
--- a/tests/baselines/reference/parameterPropertyOutsideConstructor.js
+++ b/tests/baselines/reference/parameterPropertyOutsideConstructor.js
@@ -11,4 +11,4 @@ var C = (function () {
     C.prototype.foo = function (x) {
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parameterPropertyReferencingOtherParameter.js b/tests/baselines/reference/parameterPropertyReferencingOtherParameter.js
index 18cb0e4a41c27..35715e5feab50 100644
--- a/tests/baselines/reference/parameterPropertyReferencingOtherParameter.js
+++ b/tests/baselines/reference/parameterPropertyReferencingOtherParameter.js
@@ -12,4 +12,4 @@ var Foo = (function () {
         this.y = y;
     }
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/parameterReferencesOtherParameter1.js b/tests/baselines/reference/parameterReferencesOtherParameter1.js
index 6c8bb8a06a8fd..97058974f4f19 100644
--- a/tests/baselines/reference/parameterReferencesOtherParameter1.js
+++ b/tests/baselines/reference/parameterReferencesOtherParameter1.js
@@ -14,10 +14,10 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 var UI = (function () {
     function UI(model, foo) {
         if (foo === void 0) { foo = model.name; }
     }
     return UI;
-})();
+}());
diff --git a/tests/baselines/reference/parameterReferencesOtherParameter2.js b/tests/baselines/reference/parameterReferencesOtherParameter2.js
index e9c9ff4e5d4d6..fd84f833e97fe 100644
--- a/tests/baselines/reference/parameterReferencesOtherParameter2.js
+++ b/tests/baselines/reference/parameterReferencesOtherParameter2.js
@@ -14,10 +14,10 @@ var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 var UI = (function () {
     function UI(model, foo) {
         if (foo === void 0) { foo = model.name; }
     }
     return UI;
-})();
+}());
diff --git a/tests/baselines/reference/parametersWithNoAnnotationAreAny.js b/tests/baselines/reference/parametersWithNoAnnotationAreAny.js
index a8d06125d2585..54d9d1b6e037c 100644
--- a/tests/baselines/reference/parametersWithNoAnnotationAreAny.js
+++ b/tests/baselines/reference/parametersWithNoAnnotationAreAny.js
@@ -41,7 +41,7 @@ var C = (function () {
         return x;
     };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: function (x) {
diff --git a/tests/baselines/reference/parseErrorInHeritageClause1.js b/tests/baselines/reference/parseErrorInHeritageClause1.js
index b6640b64257a1..e2f66bfadd77d 100644
--- a/tests/baselines/reference/parseErrorInHeritageClause1.js
+++ b/tests/baselines/reference/parseErrorInHeritageClause1.js
@@ -14,4 +14,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/parser0_004152.js b/tests/baselines/reference/parser0_004152.js
index 87248eb8d8395..333b64811c8f1 100644
--- a/tests/baselines/reference/parser0_004152.js
+++ b/tests/baselines/reference/parser0_004152.js
@@ -12,5 +12,5 @@ var Game = (function () {
     }
     ;
     return Game;
-})();
+}());
 exports.Game = Game;
diff --git a/tests/baselines/reference/parser509546.js b/tests/baselines/reference/parser509546.js
index 9a38cdc8b6153..ceaf9b3572c44 100644
--- a/tests/baselines/reference/parser509546.js
+++ b/tests/baselines/reference/parser509546.js
@@ -10,5 +10,5 @@ var Logger = (function () {
     function Logger() {
     }
     return Logger;
-})();
+}());
 exports.Logger = Logger;
diff --git a/tests/baselines/reference/parser509546_1.js b/tests/baselines/reference/parser509546_1.js
index 847ded1fdbab2..9d07172c50933 100644
--- a/tests/baselines/reference/parser509546_1.js
+++ b/tests/baselines/reference/parser509546_1.js
@@ -10,5 +10,5 @@ var Logger = (function () {
     function Logger() {
     }
     return Logger;
-})();
+}());
 exports.Logger = Logger;
diff --git a/tests/baselines/reference/parser509546_2.js b/tests/baselines/reference/parser509546_2.js
index 976bbd1e471d1..b8822b525419a 100644
--- a/tests/baselines/reference/parser509546_2.js
+++ b/tests/baselines/reference/parser509546_2.js
@@ -12,5 +12,5 @@ var Logger = (function () {
     function Logger() {
     }
     return Logger;
-})();
+}());
 exports.Logger = Logger;
diff --git a/tests/baselines/reference/parser509630.js b/tests/baselines/reference/parser509630.js
index 6862eef4a932e..4d94ea619ecc0 100644
--- a/tests/baselines/reference/parser509630.js
+++ b/tests/baselines/reference/parser509630.js
@@ -17,11 +17,11 @@ var Type = (function () {
         this.examples = []; // typing here
     }
     return Type;
-})();
+}());
 var Any = (function (_super) {
     __extends(Any, _super);
     function Any() {
         _super.apply(this, arguments);
     }
     return Any;
-})(Type);
+}(Type));
diff --git a/tests/baselines/reference/parser509667.js b/tests/baselines/reference/parser509667.js
index 0938613b29523..0b68d0e0f59bd 100644
--- a/tests/baselines/reference/parser509667.js
+++ b/tests/baselines/reference/parser509667.js
@@ -25,4 +25,4 @@ var Foo = (function () {
     Foo.prototype.f3 = function () {
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/parser509668.js b/tests/baselines/reference/parser509668.js
index 63c5d8a1a9556..97a51d8a5e72a 100644
--- a/tests/baselines/reference/parser509668.js
+++ b/tests/baselines/reference/parser509668.js
@@ -14,4 +14,4 @@ var Foo3 = (function () {
         }
     }
     return Foo3;
-})();
+}());
diff --git a/tests/baselines/reference/parser512084.js b/tests/baselines/reference/parser512084.js
index 967c8db3cb035..b109a3643b2b4 100644
--- a/tests/baselines/reference/parser512084.js
+++ b/tests/baselines/reference/parser512084.js
@@ -7,4 +7,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/parser553699.js b/tests/baselines/reference/parser553699.js
index 8570780e74a54..a8a39c9bea6d6 100644
--- a/tests/baselines/reference/parser553699.js
+++ b/tests/baselines/reference/parser553699.js
@@ -14,9 +14,9 @@ var Foo = (function () {
     }
     Foo.prototype.banana = function (x) { };
     return Foo;
-})();
+}());
 var Bar = (function () {
     function Bar(c) {
     }
     return Bar;
-})();
+}());
diff --git a/tests/baselines/reference/parser585151.js b/tests/baselines/reference/parser585151.js
index 16085ab3f16d5..977d90ad53834 100644
--- a/tests/baselines/reference/parser585151.js
+++ b/tests/baselines/reference/parser585151.js
@@ -9,5 +9,5 @@ var Foo2 = (function () {
     function Foo2() {
     }
     return Foo2;
-})();
+}());
 var icecream = "chocolate";
diff --git a/tests/baselines/reference/parser618973.js b/tests/baselines/reference/parser618973.js
index dbcad3e3d6ef4..df9b2e4433a39 100644
--- a/tests/baselines/reference/parser618973.js
+++ b/tests/baselines/reference/parser618973.js
@@ -12,5 +12,5 @@ var Foo = (function () {
     Foo.prototype.Bar = function () {
     };
     return Foo;
-})();
+}());
 exports.Foo = Foo;
diff --git a/tests/baselines/reference/parser642331.js b/tests/baselines/reference/parser642331.js
index 056ea7dd384b5..7d267973f47a5 100644
--- a/tests/baselines/reference/parser642331.js
+++ b/tests/baselines/reference/parser642331.js
@@ -9,4 +9,4 @@ var test = (function () {
     function test(static) {
     }
     return test;
-})();
+}());
diff --git a/tests/baselines/reference/parser642331_1.js b/tests/baselines/reference/parser642331_1.js
index 83833ee66123f..65c7fac6c232d 100644
--- a/tests/baselines/reference/parser642331_1.js
+++ b/tests/baselines/reference/parser642331_1.js
@@ -12,4 +12,4 @@ var test = (function () {
     function test(static) {
     }
     return test;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic1.js b/tests/baselines/reference/parserAccessibilityAfterStatic1.js
index 263efaf5dd21b..9e35ee6f25ed6 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic1.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic1.js
@@ -10,4 +10,4 @@ var Outer = (function () {
     function Outer() {
     }
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic10.js b/tests/baselines/reference/parserAccessibilityAfterStatic10.js
index 6756a57ce7e1a..0fe0da80156f5 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic10.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic10.js
@@ -11,4 +11,4 @@ var Outer = (function () {
     }
     Outer.intI = function () { };
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic11.js b/tests/baselines/reference/parserAccessibilityAfterStatic11.js
index 8b16153b797b7..65d618934a1db 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic11.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic11.js
@@ -11,4 +11,4 @@ var Outer = (function () {
     }
     Outer.public = function () { };
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic14.js b/tests/baselines/reference/parserAccessibilityAfterStatic14.js
index 4455936a859ee..ebb3ad88a008f 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic14.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic14.js
@@ -11,4 +11,4 @@ var Outer = (function () {
     }
     Outer.public = function () { };
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic2.js b/tests/baselines/reference/parserAccessibilityAfterStatic2.js
index 9a0a6b02722c4..b677e4c96fb9c 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic2.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic2.js
@@ -10,4 +10,4 @@ var Outer = (function () {
     function Outer() {
     }
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic3.js b/tests/baselines/reference/parserAccessibilityAfterStatic3.js
index bd3697fdbdb4f..7a9ae06e43929 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic3.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic3.js
@@ -11,4 +11,4 @@ var Outer = (function () {
     }
     Outer.public = 1;
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic4.js b/tests/baselines/reference/parserAccessibilityAfterStatic4.js
index 094b947957e4b..9db3e36248719 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic4.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic4.js
@@ -10,4 +10,4 @@ var Outer = (function () {
     function Outer() {
     }
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic5.js b/tests/baselines/reference/parserAccessibilityAfterStatic5.js
index 8373276dd0017..10be7761a877c 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic5.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic5.js
@@ -10,4 +10,4 @@ var Outer = (function () {
     function Outer() {
     }
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic6.js b/tests/baselines/reference/parserAccessibilityAfterStatic6.js
index de4fc048785bc..7b6e8eed7fd1a 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic6.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic6.js
@@ -8,4 +8,4 @@ var Outer = (function () {
     function Outer() {
     }
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic7.js b/tests/baselines/reference/parserAccessibilityAfterStatic7.js
index 2d94be8ea50cd..3bee7db9ddfc8 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic7.js
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic7.js
@@ -11,4 +11,4 @@ var Outer = (function () {
     }
     Outer.intI = function () { };
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessors1.js b/tests/baselines/reference/parserAccessors1.js
index 6b47a46ede113..fcf8a6e14ff55 100644
--- a/tests/baselines/reference/parserAccessors1.js
+++ b/tests/baselines/reference/parserAccessors1.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserAccessors2.js b/tests/baselines/reference/parserAccessors2.js
index 482daa74a646d..6a76cf0671a19 100644
--- a/tests/baselines/reference/parserAccessors2.js
+++ b/tests/baselines/reference/parserAccessors2.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserAstSpans1.js b/tests/baselines/reference/parserAstSpans1.js
index 5de3cb8f9f148..41f07380e97fa 100644
--- a/tests/baselines/reference/parserAstSpans1.js
+++ b/tests/baselines/reference/parserAstSpans1.js
@@ -239,7 +239,7 @@ var c1 = (function () {
     c1.prototype.nc_f1 = function () {
     };
     return c1;
-})();
+}());
 var i1_i;
 i1_i.i1_f1();
 i1_i.i1_nc_f1();
@@ -314,7 +314,7 @@ var c2 = (function () {
         configurable: true
     });
     return c2;
-})();
+}());
 var c3 = (function (_super) {
     __extends(c3, _super);
     function c3() {
@@ -342,7 +342,7 @@ var c3 = (function (_super) {
         configurable: true
     });
     return c3;
-})(c2);
+}(c2));
 var c2_i = new c2(10);
 var c3_i = new c3();
 c2_i.c2_f1();
@@ -365,7 +365,7 @@ var c4 = (function (_super) {
         _super.apply(this, arguments);
     }
     return c4;
-})(c2);
+}(c2));
 var c4_i = new c4(10);
 var i2_i;
 var i3_i;
@@ -400,7 +400,7 @@ var c5 = (function () {
     function c5() {
     }
     return c5;
-})();
+}());
 var c6 = (function (_super) {
     __extends(c6, _super);
     function c6() {
@@ -408,4 +408,4 @@ var c6 = (function (_super) {
         this.d = _super.prototype.b;
     }
     return c6;
-})(c5);
+}(c5));
diff --git a/tests/baselines/reference/parserClass1.js b/tests/baselines/reference/parserClass1.js
index 3f772a2f692c5..50d2fb179dc92 100644
--- a/tests/baselines/reference/parserClass1.js
+++ b/tests/baselines/reference/parserClass1.js
@@ -22,5 +22,5 @@ var NullLogger = (function () {
     NullLogger.prototype.log = function (s) {
     };
     return NullLogger;
-})();
+}());
 exports.NullLogger = NullLogger;
diff --git a/tests/baselines/reference/parserClass2.js b/tests/baselines/reference/parserClass2.js
index 1fe84f37a074d..c1d3b87e892eb 100644
--- a/tests/baselines/reference/parserClass2.js
+++ b/tests/baselines/reference/parserClass2.js
@@ -15,5 +15,5 @@ var LoggerAdapter = (function () {
         this._information = this.logger.information();
     }
     return LoggerAdapter;
-})();
+}());
 exports.LoggerAdapter = LoggerAdapter;
diff --git a/tests/baselines/reference/parserClassDeclaration1.js b/tests/baselines/reference/parserClassDeclaration1.js
index f430b8e644acf..41ecc9135c043 100644
--- a/tests/baselines/reference/parserClassDeclaration1.js
+++ b/tests/baselines/reference/parserClassDeclaration1.js
@@ -14,4 +14,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/parserClassDeclaration10.js b/tests/baselines/reference/parserClassDeclaration10.js
index 9b912f9eaac5c..9af82a82f5246 100644
--- a/tests/baselines/reference/parserClassDeclaration10.js
+++ b/tests/baselines/reference/parserClassDeclaration10.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration11.js b/tests/baselines/reference/parserClassDeclaration11.js
index 078d3553a438b..5749fa24f855b 100644
--- a/tests/baselines/reference/parserClassDeclaration11.js
+++ b/tests/baselines/reference/parserClassDeclaration11.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype.foo = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration12.js b/tests/baselines/reference/parserClassDeclaration12.js
index 709bae1b29fdd..e4458c09ef687 100644
--- a/tests/baselines/reference/parserClassDeclaration12.js
+++ b/tests/baselines/reference/parserClassDeclaration12.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C(a) {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration13.js b/tests/baselines/reference/parserClassDeclaration13.js
index 93ce76fb168b2..ad0ca6d502f2d 100644
--- a/tests/baselines/reference/parserClassDeclaration13.js
+++ b/tests/baselines/reference/parserClassDeclaration13.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype.bar = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration14.js b/tests/baselines/reference/parserClassDeclaration14.js
index 9fbfc59816846..724337abf0016 100644
--- a/tests/baselines/reference/parserClassDeclaration14.js
+++ b/tests/baselines/reference/parserClassDeclaration14.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration15.js b/tests/baselines/reference/parserClassDeclaration15.js
index 4d0a285690a44..5d96374d18d4b 100644
--- a/tests/baselines/reference/parserClassDeclaration15.js
+++ b/tests/baselines/reference/parserClassDeclaration15.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration16.js b/tests/baselines/reference/parserClassDeclaration16.js
index a6a92d73afaec..94ce889b9ba58 100644
--- a/tests/baselines/reference/parserClassDeclaration16.js
+++ b/tests/baselines/reference/parserClassDeclaration16.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype.foo = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration19.js b/tests/baselines/reference/parserClassDeclaration19.js
index 7900aa4d552df..9be5032e6986d 100644
--- a/tests/baselines/reference/parserClassDeclaration19.js
+++ b/tests/baselines/reference/parserClassDeclaration19.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype["foo"] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration2.js b/tests/baselines/reference/parserClassDeclaration2.js
index 18bb068b23f3f..b462ee6e31e95 100644
--- a/tests/baselines/reference/parserClassDeclaration2.js
+++ b/tests/baselines/reference/parserClassDeclaration2.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration20.js b/tests/baselines/reference/parserClassDeclaration20.js
index 7c99f2d8ee612..56dc7c2ce9df9 100644
--- a/tests/baselines/reference/parserClassDeclaration20.js
+++ b/tests/baselines/reference/parserClassDeclaration20.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype["0"] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration21.js b/tests/baselines/reference/parserClassDeclaration21.js
index fa4cef46e0ec8..c28d25963c282 100644
--- a/tests/baselines/reference/parserClassDeclaration21.js
+++ b/tests/baselines/reference/parserClassDeclaration21.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype[1] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration22.js b/tests/baselines/reference/parserClassDeclaration22.js
index 596f7a4474ba2..2b979579ddac0 100644
--- a/tests/baselines/reference/parserClassDeclaration22.js
+++ b/tests/baselines/reference/parserClassDeclaration22.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype["bar"] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration23.js b/tests/baselines/reference/parserClassDeclaration23.js
index 40b291bb0075f..f9d8d0f8f5aea 100644
--- a/tests/baselines/reference/parserClassDeclaration23.js
+++ b/tests/baselines/reference/parserClassDeclaration23.js
@@ -7,4 +7,4 @@ var C\u0032 = (function () {
     function C\u0032() {
     }
     return C\u0032;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration24.js b/tests/baselines/reference/parserClassDeclaration24.js
index 8cf6e634cb204..b4b086253dc67 100644
--- a/tests/baselines/reference/parserClassDeclaration24.js
+++ b/tests/baselines/reference/parserClassDeclaration24.js
@@ -7,4 +7,4 @@ var any = (function () {
     function any() {
     }
     return any;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration25.js b/tests/baselines/reference/parserClassDeclaration25.js
index 69a8fded51e83..f8ab42f19bd1d 100644
--- a/tests/baselines/reference/parserClassDeclaration25.js
+++ b/tests/baselines/reference/parserClassDeclaration25.js
@@ -14,4 +14,4 @@ var List = (function () {
     function List() {
     }
     return List;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration26.js b/tests/baselines/reference/parserClassDeclaration26.js
index 94b56f521ddb3..3b5751b07cbb8 100644
--- a/tests/baselines/reference/parserClassDeclaration26.js
+++ b/tests/baselines/reference/parserClassDeclaration26.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration3.js b/tests/baselines/reference/parserClassDeclaration3.js
index 8ea681a668f5b..c375b4b5a211c 100644
--- a/tests/baselines/reference/parserClassDeclaration3.js
+++ b/tests/baselines/reference/parserClassDeclaration3.js
@@ -14,4 +14,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/parserClassDeclaration4.js b/tests/baselines/reference/parserClassDeclaration4.js
index 2bbbd134ed457..f19ac06c35cc4 100644
--- a/tests/baselines/reference/parserClassDeclaration4.js
+++ b/tests/baselines/reference/parserClassDeclaration4.js
@@ -14,4 +14,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/parserClassDeclaration5.js b/tests/baselines/reference/parserClassDeclaration5.js
index 146cbda9563b9..272edc89fb6d5 100644
--- a/tests/baselines/reference/parserClassDeclaration5.js
+++ b/tests/baselines/reference/parserClassDeclaration5.js
@@ -14,4 +14,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/parserClassDeclaration6.js b/tests/baselines/reference/parserClassDeclaration6.js
index 0f65ad53f079e..88d8481d52a91 100644
--- a/tests/baselines/reference/parserClassDeclaration6.js
+++ b/tests/baselines/reference/parserClassDeclaration6.js
@@ -14,4 +14,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/parserClassDeclaration8.js b/tests/baselines/reference/parserClassDeclaration8.js
index 2d1a830c65006..1698fa169dda7 100644
--- a/tests/baselines/reference/parserClassDeclaration8.js
+++ b/tests/baselines/reference/parserClassDeclaration8.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclaration9.js b/tests/baselines/reference/parserClassDeclaration9.js
index f1c87f582a935..b45962eacf770 100644
--- a/tests/baselines/reference/parserClassDeclaration9.js
+++ b/tests/baselines/reference/parserClassDeclaration9.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserClassDeclarationIndexSignature1.js b/tests/baselines/reference/parserClassDeclarationIndexSignature1.js
index 8a401b17ab22f..430ee220db8f5 100644
--- a/tests/baselines/reference/parserClassDeclarationIndexSignature1.js
+++ b/tests/baselines/reference/parserClassDeclarationIndexSignature1.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration1.js b/tests/baselines/reference/parserConstructorDeclaration1.js
index 6de0ec3332b9a..bd29f61c884a9 100644
--- a/tests/baselines/reference/parserConstructorDeclaration1.js
+++ b/tests/baselines/reference/parserConstructorDeclaration1.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration10.js b/tests/baselines/reference/parserConstructorDeclaration10.js
index 9289636e9190a..96470c8062430 100644
--- a/tests/baselines/reference/parserConstructorDeclaration10.js
+++ b/tests/baselines/reference/parserConstructorDeclaration10.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration11.js b/tests/baselines/reference/parserConstructorDeclaration11.js
index a21fa87f69469..60e012ded4baf 100644
--- a/tests/baselines/reference/parserConstructorDeclaration11.js
+++ b/tests/baselines/reference/parserConstructorDeclaration11.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration12.js b/tests/baselines/reference/parserConstructorDeclaration12.js
index dc540c3323ee9..025b994ff0421 100644
--- a/tests/baselines/reference/parserConstructorDeclaration12.js
+++ b/tests/baselines/reference/parserConstructorDeclaration12.js
@@ -15,4 +15,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration2.js b/tests/baselines/reference/parserConstructorDeclaration2.js
index 142bf5a531430..929b4dd295da3 100644
--- a/tests/baselines/reference/parserConstructorDeclaration2.js
+++ b/tests/baselines/reference/parserConstructorDeclaration2.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration3.js b/tests/baselines/reference/parserConstructorDeclaration3.js
index 6e7531f1e669f..f45e854d87801 100644
--- a/tests/baselines/reference/parserConstructorDeclaration3.js
+++ b/tests/baselines/reference/parserConstructorDeclaration3.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration4.js b/tests/baselines/reference/parserConstructorDeclaration4.js
index 2b1ae1cdb6880..46e1602a21f4e 100644
--- a/tests/baselines/reference/parserConstructorDeclaration4.js
+++ b/tests/baselines/reference/parserConstructorDeclaration4.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration5.js b/tests/baselines/reference/parserConstructorDeclaration5.js
index c0d8c03458e35..a18d5351c77ba 100644
--- a/tests/baselines/reference/parserConstructorDeclaration5.js
+++ b/tests/baselines/reference/parserConstructorDeclaration5.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration6.js b/tests/baselines/reference/parserConstructorDeclaration6.js
index abee73fe0b815..eca0638116d7a 100644
--- a/tests/baselines/reference/parserConstructorDeclaration6.js
+++ b/tests/baselines/reference/parserConstructorDeclaration6.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration7.js b/tests/baselines/reference/parserConstructorDeclaration7.js
index 8c3b4db9d2246..2b19cfab11141 100644
--- a/tests/baselines/reference/parserConstructorDeclaration7.js
+++ b/tests/baselines/reference/parserConstructorDeclaration7.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration8.js b/tests/baselines/reference/parserConstructorDeclaration8.js
index 26c06b591c04d..4ad3f93a1d837 100644
--- a/tests/baselines/reference/parserConstructorDeclaration8.js
+++ b/tests/baselines/reference/parserConstructorDeclaration8.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserConstructorDeclaration9.js b/tests/baselines/reference/parserConstructorDeclaration9.js
index 8393d35f5e72e..d30ed12f31361 100644
--- a/tests/baselines/reference/parserConstructorDeclaration9.js
+++ b/tests/baselines/reference/parserConstructorDeclaration9.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserES3Accessors1.js b/tests/baselines/reference/parserES3Accessors1.js
index b4d0b9d657660..df1d416ced0e9 100644
--- a/tests/baselines/reference/parserES3Accessors1.js
+++ b/tests/baselines/reference/parserES3Accessors1.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserES3Accessors2.js b/tests/baselines/reference/parserES3Accessors2.js
index 3d18e8ac28076..68f4ac6737735 100644
--- a/tests/baselines/reference/parserES3Accessors2.js
+++ b/tests/baselines/reference/parserES3Accessors2.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName10.js b/tests/baselines/reference/parserES5ComputedPropertyName10.js
index a69165a192a03..d648ce29e9a24 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName10.js
+++ b/tests/baselines/reference/parserES5ComputedPropertyName10.js
@@ -9,4 +9,4 @@ var C = (function () {
         this[e] = 1;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName11.js b/tests/baselines/reference/parserES5ComputedPropertyName11.js
index dfa74b03a5f4a..dd777f5308060 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName11.js
+++ b/tests/baselines/reference/parserES5ComputedPropertyName11.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName7.js b/tests/baselines/reference/parserES5ComputedPropertyName7.js
index 8634682c6605b..b707d7ea74729 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName7.js
+++ b/tests/baselines/reference/parserES5ComputedPropertyName7.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName9.js b/tests/baselines/reference/parserES5ComputedPropertyName9.js
index fdefc8649d0fc..904bd3b0e3279 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName9.js
+++ b/tests/baselines/reference/parserES5ComputedPropertyName9.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserES5SymbolIndexer2.js b/tests/baselines/reference/parserES5SymbolIndexer2.js
index c511b6acafae2..fbd0ff168fac0 100644
--- a/tests/baselines/reference/parserES5SymbolIndexer2.js
+++ b/tests/baselines/reference/parserES5SymbolIndexer2.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserES5SymbolProperty5.js b/tests/baselines/reference/parserES5SymbolProperty5.js
index e2448432542c5..e50c6ad93adb6 100644
--- a/tests/baselines/reference/parserES5SymbolProperty5.js
+++ b/tests/baselines/reference/parserES5SymbolProperty5.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserES5SymbolProperty6.js b/tests/baselines/reference/parserES5SymbolProperty6.js
index ce2050688c3a1..67e77d29dfb36 100644
--- a/tests/baselines/reference/parserES5SymbolProperty6.js
+++ b/tests/baselines/reference/parserES5SymbolProperty6.js
@@ -9,4 +9,4 @@ var C = (function () {
         this[Symbol.toStringTag] = "";
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserES5SymbolProperty7.js b/tests/baselines/reference/parserES5SymbolProperty7.js
index 102d10af417d5..4965f7867c310 100644
--- a/tests/baselines/reference/parserES5SymbolProperty7.js
+++ b/tests/baselines/reference/parserES5SymbolProperty7.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype[Symbol.toStringTag] = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrantSemicolonInClass1.js b/tests/baselines/reference/parserErrantSemicolonInClass1.js
index f3834da7e78a4..7dbe9f579d289 100644
--- a/tests/baselines/reference/parserErrantSemicolonInClass1.js
+++ b/tests/baselines/reference/parserErrantSemicolonInClass1.js
@@ -70,4 +70,4 @@ var a = (function () {
         return ns.toString();
     };
     return a;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement1.js b/tests/baselines/reference/parserErrorRecoveryIfStatement1.js
index 662f3056a3d48..03e3de32cc175 100644
--- a/tests/baselines/reference/parserErrorRecoveryIfStatement1.js
+++ b/tests/baselines/reference/parserErrorRecoveryIfStatement1.js
@@ -22,4 +22,4 @@ var Foo = (function () {
     Foo.prototype.f3 = function () {
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement2.js b/tests/baselines/reference/parserErrorRecoveryIfStatement2.js
index 171f307253575..84daa435711b0 100644
--- a/tests/baselines/reference/parserErrorRecoveryIfStatement2.js
+++ b/tests/baselines/reference/parserErrorRecoveryIfStatement2.js
@@ -22,4 +22,4 @@ var Foo = (function () {
     Foo.prototype.f3 = function () {
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement3.js b/tests/baselines/reference/parserErrorRecoveryIfStatement3.js
index 117525bcba06b..b58c0ccd524ef 100644
--- a/tests/baselines/reference/parserErrorRecoveryIfStatement3.js
+++ b/tests/baselines/reference/parserErrorRecoveryIfStatement3.js
@@ -22,4 +22,4 @@ var Foo = (function () {
     Foo.prototype.f3 = function () {
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement4.js b/tests/baselines/reference/parserErrorRecoveryIfStatement4.js
index 460ca957c02fd..3d5e6af1fe6aa 100644
--- a/tests/baselines/reference/parserErrorRecoveryIfStatement4.js
+++ b/tests/baselines/reference/parserErrorRecoveryIfStatement4.js
@@ -22,4 +22,4 @@ var Foo = (function () {
     Foo.prototype.f3 = function () {
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement5.js b/tests/baselines/reference/parserErrorRecoveryIfStatement5.js
index 8df07082c42a9..b3a4f897aa7ff 100644
--- a/tests/baselines/reference/parserErrorRecoveryIfStatement5.js
+++ b/tests/baselines/reference/parserErrorRecoveryIfStatement5.js
@@ -24,4 +24,4 @@ var Foo = (function () {
         }
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecoveryIfStatement6.js b/tests/baselines/reference/parserErrorRecoveryIfStatement6.js
index fa327a7381437..86454bed4f2f2 100644
--- a/tests/baselines/reference/parserErrorRecoveryIfStatement6.js
+++ b/tests/baselines/reference/parserErrorRecoveryIfStatement6.js
@@ -23,4 +23,4 @@ var Foo = (function () {
     Foo.prototype.f3 = function () {
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecovery_Block3.js b/tests/baselines/reference/parserErrorRecovery_Block3.js
index 55b0a4d65e7f3..1851d148bc83c 100644
--- a/tests/baselines/reference/parserErrorRecovery_Block3.js
+++ b/tests/baselines/reference/parserErrorRecovery_Block3.js
@@ -14,4 +14,4 @@ var C = (function () {
     C.prototype.b = function () {
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement1.js b/tests/baselines/reference/parserErrorRecovery_ClassElement1.js
index 7a3bf441e4744..16f796a0fac40 100644
--- a/tests/baselines/reference/parserErrorRecovery_ClassElement1.js
+++ b/tests/baselines/reference/parserErrorRecovery_ClassElement1.js
@@ -11,11 +11,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 // Classes can't be nested.  So we should bail out of parsing here and recover
 // this as a source unit element.
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement2.js b/tests/baselines/reference/parserErrorRecovery_ClassElement2.js
index fca227a4e8ab2..bab50d52751b5 100644
--- a/tests/baselines/reference/parserErrorRecovery_ClassElement2.js
+++ b/tests/baselines/reference/parserErrorRecovery_ClassElement2.js
@@ -13,7 +13,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     var E;
     (function (E) {
     })(E || (E = {}));
diff --git a/tests/baselines/reference/parserErrorRecovery_ClassElement3.js b/tests/baselines/reference/parserErrorRecovery_ClassElement3.js
index 39e701628bbe3..b5021218ada74 100644
--- a/tests/baselines/reference/parserErrorRecovery_ClassElement3.js
+++ b/tests/baselines/reference/parserErrorRecovery_ClassElement3.js
@@ -14,7 +14,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     var E;
     (function (E) {
     })(E || (E = {}));
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause1.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause1.js
index b6557221c65c3..1215631857e1d 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause1.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause1.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
index 3c2f96f54fd8d..b53c41fb45c33 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
@@ -14,4 +14,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.js
index b420e12cccb4b..33bba3cf860dd 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause3.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
index 594c4575eabc7..500f6d38c6d38 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
@@ -14,4 +14,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
index 3d2447e0b8cd6..8c02a996ea514 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
@@ -14,4 +14,4 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js
index 8055cd9d4947b..9bb4395e55655 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable1.js
@@ -44,7 +44,7 @@ var Shapes;
         // Static member
         Point.origin = new Point(0, 0);
         return Point;
-    })();
+    }());
     Shapes.Point = Point;
 })(Shapes || (Shapes = {}));
 // Local variables
diff --git a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js
index 4936b1ea8bcd4..0ee73b8b1e5bf 100644
--- a/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js
+++ b/tests/baselines/reference/parserErrorRecovery_IncompleteMemberVariable2.js
@@ -45,7 +45,7 @@ var Shapes;
         // Static member
         Point.origin = new Point(0, 0);
         return Point;
-    })();
+    }());
     Shapes.Point = Point;
 })(Shapes || (Shapes = {}));
 // Local variables
diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList6.js b/tests/baselines/reference/parserErrorRecovery_ParameterList6.js
index 060ad14766b32..21e43f31512f5 100644
--- a/tests/baselines/reference/parserErrorRecovery_ParameterList6.js
+++ b/tests/baselines/reference/parserErrorRecovery_ParameterList6.js
@@ -9,6 +9,6 @@ var Foo = (function () {
     }
     Foo.prototype.banana = ;
     return Foo;
-})();
+}());
 break ;
 { }
diff --git a/tests/baselines/reference/parserErrorRecovery_SourceUnit1.js b/tests/baselines/reference/parserErrorRecovery_SourceUnit1.js
index a4b6427508f0e..a763012e0e631 100644
--- a/tests/baselines/reference/parserErrorRecovery_SourceUnit1.js
+++ b/tests/baselines/reference/parserErrorRecovery_SourceUnit1.js
@@ -10,9 +10,9 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js b/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js
index 0fd532dde155e..093b8ae7231c9 100644
--- a/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js
+++ b/tests/baselines/reference/parserErrorRecovery_SwitchStatement2.js
@@ -15,7 +15,7 @@ var C = (function () {
             function D() {
             }
             return D;
-        })();
+        }());
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserExportAssignment7.js b/tests/baselines/reference/parserExportAssignment7.js
index 4e3982e429562..baf8ec5b6bbbc 100644
--- a/tests/baselines/reference/parserExportAssignment7.js
+++ b/tests/baselines/reference/parserExportAssignment7.js
@@ -10,5 +10,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 exports.C = C;
diff --git a/tests/baselines/reference/parserExportAssignment8.js b/tests/baselines/reference/parserExportAssignment8.js
index 580a0bfe80471..23f94dbe1e3b7 100644
--- a/tests/baselines/reference/parserExportAssignment8.js
+++ b/tests/baselines/reference/parserExportAssignment8.js
@@ -10,5 +10,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 exports.C = C;
diff --git a/tests/baselines/reference/parserGenericClass1.js b/tests/baselines/reference/parserGenericClass1.js
index a946cd1ec157d..1ba9b0f49c515 100644
--- a/tests/baselines/reference/parserGenericClass1.js
+++ b/tests/baselines/reference/parserGenericClass1.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserGenericClass2.js b/tests/baselines/reference/parserGenericClass2.js
index 57e6377752271..ef40783ab7979 100644
--- a/tests/baselines/reference/parserGenericClass2.js
+++ b/tests/baselines/reference/parserGenericClass2.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserGenericConstraint1.js b/tests/baselines/reference/parserGenericConstraint1.js
index d4e9d3242c4e9..395a65a52fb56 100644
--- a/tests/baselines/reference/parserGenericConstraint1.js
+++ b/tests/baselines/reference/parserGenericConstraint1.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserGenericConstraint2.js b/tests/baselines/reference/parserGenericConstraint2.js
index 9538530bb267a..18218ecd992d1 100644
--- a/tests/baselines/reference/parserGenericConstraint2.js
+++ b/tests/baselines/reference/parserGenericConstraint2.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserGenericConstraint3.js b/tests/baselines/reference/parserGenericConstraint3.js
index 259377da4f6c4..a8a6669186c79 100644
--- a/tests/baselines/reference/parserGenericConstraint3.js
+++ b/tests/baselines/reference/parserGenericConstraint3.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserGenericConstraint4.js b/tests/baselines/reference/parserGenericConstraint4.js
index 15c19cb40ad90..69e26feba8fc3 100644
--- a/tests/baselines/reference/parserGenericConstraint4.js
+++ b/tests/baselines/reference/parserGenericConstraint4.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserGenericConstraint5.js b/tests/baselines/reference/parserGenericConstraint5.js
index 1cf637fd08d71..46b1959493706 100644
--- a/tests/baselines/reference/parserGenericConstraint5.js
+++ b/tests/baselines/reference/parserGenericConstraint5.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserGenericConstraint6.js b/tests/baselines/reference/parserGenericConstraint6.js
index fb41cf17d24d9..1dd809e41188a 100644
--- a/tests/baselines/reference/parserGenericConstraint6.js
+++ b/tests/baselines/reference/parserGenericConstraint6.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserGenericConstraint7.js b/tests/baselines/reference/parserGenericConstraint7.js
index 2d85afcdb5bb1..6d3107a1c4fe4 100644
--- a/tests/baselines/reference/parserGenericConstraint7.js
+++ b/tests/baselines/reference/parserGenericConstraint7.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts1.js b/tests/baselines/reference/parserGenericsInTypeContexts1.js
index 9cea884bcfb7c..f6f4f39393fb4 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.js
@@ -29,7 +29,7 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 var v1;
 var v2 = null;
 var v3;
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts2.js b/tests/baselines/reference/parserGenericsInTypeContexts2.js
index b5e5e010d569e..99e19586c52da 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.js
@@ -29,7 +29,7 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 var v1;
 var v2 = null;
 var v3;
diff --git a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.js b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.js
index 5a226dab62866..467eb93d0da84 100644
--- a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.js
+++ b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration1.js b/tests/baselines/reference/parserIndexMemberDeclaration1.js
index 6da7cdb0a769d..5db1aebd6835d 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration1.js
+++ b/tests/baselines/reference/parserIndexMemberDeclaration1.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration10.js b/tests/baselines/reference/parserIndexMemberDeclaration10.js
index cba928413a320..99d41e5410be2 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration10.js
+++ b/tests/baselines/reference/parserIndexMemberDeclaration10.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration2.js b/tests/baselines/reference/parserIndexMemberDeclaration2.js
index 6a35169851649..afd60f7e2b109 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration2.js
+++ b/tests/baselines/reference/parserIndexMemberDeclaration2.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration3.js b/tests/baselines/reference/parserIndexMemberDeclaration3.js
index caa9bedf4499c..1f06401dc0c7e 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration3.js
+++ b/tests/baselines/reference/parserIndexMemberDeclaration3.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration4.js b/tests/baselines/reference/parserIndexMemberDeclaration4.js
index ebf05909c2f62..9b054efcec3e7 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration4.js
+++ b/tests/baselines/reference/parserIndexMemberDeclaration4.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration5.js b/tests/baselines/reference/parserIndexMemberDeclaration5.js
index 209e26ae4c0e0..df681657a1569 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration5.js
+++ b/tests/baselines/reference/parserIndexMemberDeclaration5.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration6.js b/tests/baselines/reference/parserIndexMemberDeclaration6.js
index 9dae6a786b4ac..c5356f58a6576 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration6.js
+++ b/tests/baselines/reference/parserIndexMemberDeclaration6.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration7.js b/tests/baselines/reference/parserIndexMemberDeclaration7.js
index 550063e66596f..214f0d244afd1 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration7.js
+++ b/tests/baselines/reference/parserIndexMemberDeclaration7.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration8.js b/tests/baselines/reference/parserIndexMemberDeclaration8.js
index c1f40ad0f153a..c97df0c29483c 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration8.js
+++ b/tests/baselines/reference/parserIndexMemberDeclaration8.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserIndexMemberDeclaration9.js b/tests/baselines/reference/parserIndexMemberDeclaration9.js
index bd547be3bd376..3289715b3a3a5 100644
--- a/tests/baselines/reference/parserIndexMemberDeclaration9.js
+++ b/tests/baselines/reference/parserIndexMemberDeclaration9.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js b/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js
index e6b9c9fa1b898..039d9d8926fcf 100644
--- a/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js
+++ b/tests/baselines/reference/parserInvalidIdentifiersInVariableStatements1.js
@@ -13,6 +13,6 @@ var default_1 = (function () {
     function default_1() {
     }
     return default_1;
-})();
+}());
 ;
 var bar;
diff --git a/tests/baselines/reference/parserMemberAccessor1.js b/tests/baselines/reference/parserMemberAccessor1.js
index 866a171bc4346..ffbc62c830053 100644
--- a/tests/baselines/reference/parserMemberAccessor1.js
+++ b/tests/baselines/reference/parserMemberAccessor1.js
@@ -15,4 +15,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration1.js b/tests/baselines/reference/parserMemberAccessorDeclaration1.js
index 30534735cfcb0..eec8364cacb08 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration1.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration1.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration10.js b/tests/baselines/reference/parserMemberAccessorDeclaration10.js
index d778b192279d8..fd02058d06c1e 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration10.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration10.js
@@ -14,4 +14,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration11.js b/tests/baselines/reference/parserMemberAccessorDeclaration11.js
index da8d7fc642564..d2ed28ec1b435 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration11.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration11.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration12.js b/tests/baselines/reference/parserMemberAccessorDeclaration12.js
index 72923e060c43a..85ad8ec231d56 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration12.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration12.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration13.js b/tests/baselines/reference/parserMemberAccessorDeclaration13.js
index 14b0f1b0a05f6..0882cb84bd489 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration13.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration13.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration14.js b/tests/baselines/reference/parserMemberAccessorDeclaration14.js
index 21b11219ca170..a40b5eafa5def 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration14.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration14.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration15.js b/tests/baselines/reference/parserMemberAccessorDeclaration15.js
index 0d01c75840c97..333ae53847323 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration15.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration15.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration16.js b/tests/baselines/reference/parserMemberAccessorDeclaration16.js
index a6cd0aaa7e9f3..aa70918914bfb 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration16.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration16.js
@@ -15,4 +15,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration17.js b/tests/baselines/reference/parserMemberAccessorDeclaration17.js
index d61fa2e840993..10334e7881c5d 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration17.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration17.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration18.js b/tests/baselines/reference/parserMemberAccessorDeclaration18.js
index 9483a1f2dafd4..e25aa69f4654f 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration18.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration18.js
@@ -18,4 +18,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration2.js b/tests/baselines/reference/parserMemberAccessorDeclaration2.js
index f29efc846ee32..01d98d67694bf 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration2.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration2.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.js b/tests/baselines/reference/parserMemberAccessorDeclaration3.js
index 9c64bf0252242..acde7a1daed85 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration3.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration3.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration4.js b/tests/baselines/reference/parserMemberAccessorDeclaration4.js
index e65f6431a7c9d..f0cea8d239a17 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration4.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration4.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.js b/tests/baselines/reference/parserMemberAccessorDeclaration5.js
index d304a44d64df5..6c990debd85c8 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration5.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration5.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.js b/tests/baselines/reference/parserMemberAccessorDeclaration6.js
index 9c6f3ce8a559c..3f9f6d9bea9b7 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration6.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration7.js b/tests/baselines/reference/parserMemberAccessorDeclaration7.js
index ce103accf6144..fd4ed1b492305 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration7.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration7.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration8.js b/tests/baselines/reference/parserMemberAccessorDeclaration8.js
index 07f12acae401f..edcca9cabc2b4 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration8.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration8.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration9.js b/tests/baselines/reference/parserMemberAccessorDeclaration9.js
index 02183d46ef174..5872d37203bb4 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration9.js
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration9.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration1.js b/tests/baselines/reference/parserMemberFunctionDeclaration1.js
index 1d40fa947007d..21a4793b19084 100644
--- a/tests/baselines/reference/parserMemberFunctionDeclaration1.js
+++ b/tests/baselines/reference/parserMemberFunctionDeclaration1.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype.Foo = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration2.js b/tests/baselines/reference/parserMemberFunctionDeclaration2.js
index fed1a6a0743ae..2b94b05aea2a9 100644
--- a/tests/baselines/reference/parserMemberFunctionDeclaration2.js
+++ b/tests/baselines/reference/parserMemberFunctionDeclaration2.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.Foo = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration3.js b/tests/baselines/reference/parserMemberFunctionDeclaration3.js
index 18bbec7ba5f45..9754db2c1a83b 100644
--- a/tests/baselines/reference/parserMemberFunctionDeclaration3.js
+++ b/tests/baselines/reference/parserMemberFunctionDeclaration3.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.Foo = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration4.js b/tests/baselines/reference/parserMemberFunctionDeclaration4.js
index cd12f23442c64..f082a450346cd 100644
--- a/tests/baselines/reference/parserMemberFunctionDeclaration4.js
+++ b/tests/baselines/reference/parserMemberFunctionDeclaration4.js
@@ -10,4 +10,4 @@ var C = (function () {
     C.prototype.Foo = function () { }
     exports.Foo = Foo;;
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberFunctionDeclaration5.js b/tests/baselines/reference/parserMemberFunctionDeclaration5.js
index 75630d3455153..8d060cb7cc9c5 100644
--- a/tests/baselines/reference/parserMemberFunctionDeclaration5.js
+++ b/tests/baselines/reference/parserMemberFunctionDeclaration5.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype.Foo = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js b/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js
index e0a0f7860cc7a..f84123762107f 100644
--- a/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js
+++ b/tests/baselines/reference/parserMemberFunctionDeclarationAmbiguities1.js
@@ -26,4 +26,4 @@ var C = (function () {
     C.public = function () { };
     C.static = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberVariableDeclaration1.js b/tests/baselines/reference/parserMemberVariableDeclaration1.js
index 7c59fa7db4c12..aac616cc10ee5 100644
--- a/tests/baselines/reference/parserMemberVariableDeclaration1.js
+++ b/tests/baselines/reference/parserMemberVariableDeclaration1.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberVariableDeclaration2.js b/tests/baselines/reference/parserMemberVariableDeclaration2.js
index 7f4ae15a7ee56..9d9032f7fb0a7 100644
--- a/tests/baselines/reference/parserMemberVariableDeclaration2.js
+++ b/tests/baselines/reference/parserMemberVariableDeclaration2.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberVariableDeclaration3.js b/tests/baselines/reference/parserMemberVariableDeclaration3.js
index e03279abed9d6..3518443cf6eeb 100644
--- a/tests/baselines/reference/parserMemberVariableDeclaration3.js
+++ b/tests/baselines/reference/parserMemberVariableDeclaration3.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberVariableDeclaration4.js b/tests/baselines/reference/parserMemberVariableDeclaration4.js
index d52dd0f4a083c..6e0c89038995c 100644
--- a/tests/baselines/reference/parserMemberVariableDeclaration4.js
+++ b/tests/baselines/reference/parserMemberVariableDeclaration4.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMemberVariableDeclaration5.js b/tests/baselines/reference/parserMemberVariableDeclaration5.js
index bc8a49ff3f512..47b563e8a7813 100644
--- a/tests/baselines/reference/parserMemberVariableDeclaration5.js
+++ b/tests/baselines/reference/parserMemberVariableDeclaration5.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.js b/tests/baselines/reference/parserMissingLambdaOpenBrace1.js
index 8280d8dc9b2f5..36b3d92fcd787 100644
--- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.js
+++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.js
@@ -20,4 +20,4 @@ var C = (function () {
         });
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserParameterList1.js b/tests/baselines/reference/parserParameterList1.js
index 86b0690728dab..7fabad715e1f6 100644
--- a/tests/baselines/reference/parserParameterList1.js
+++ b/tests/baselines/reference/parserParameterList1.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype.F = function (A, B) { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserParameterList10.js b/tests/baselines/reference/parserParameterList10.js
index 7a4e8132868d5..93ed8c60e8bee 100644
--- a/tests/baselines/reference/parserParameterList10.js
+++ b/tests/baselines/reference/parserParameterList10.js
@@ -14,4 +14,4 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserParameterList16.js b/tests/baselines/reference/parserParameterList16.js
index 50c58215478dc..9565cba53c1ca 100644
--- a/tests/baselines/reference/parserParameterList16.js
+++ b/tests/baselines/reference/parserParameterList16.js
@@ -10,4 +10,4 @@ var C = (function () {
     }
     C.prototype.foo = function (a, b) { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserParameterList17.js b/tests/baselines/reference/parserParameterList17.js
index 069c4975cddd6..f38c9d062c950 100644
--- a/tests/baselines/reference/parserParameterList17.js
+++ b/tests/baselines/reference/parserParameterList17.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C(a, b) {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserParameterList2.js b/tests/baselines/reference/parserParameterList2.js
index c6a7f48c43e07..8fcddb532dca8 100644
--- a/tests/baselines/reference/parserParameterList2.js
+++ b/tests/baselines/reference/parserParameterList2.js
@@ -11,4 +11,4 @@ var C = (function () {
         if (A === void 0) { A = 0; }
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserParameterList3.js b/tests/baselines/reference/parserParameterList3.js
index 3992dc548efea..d2cf7c5c9f519 100644
--- a/tests/baselines/reference/parserParameterList3.js
+++ b/tests/baselines/reference/parserParameterList3.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.prototype.F = function (A, B) { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserParameterList6.js b/tests/baselines/reference/parserParameterList6.js
index a535bcfe1b066..4713cf9197848 100644
--- a/tests/baselines/reference/parserParameterList6.js
+++ b/tests/baselines/reference/parserParameterList6.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C(C) {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserParameterList7.js b/tests/baselines/reference/parserParameterList7.js
index 5485d74315a5c..391d3158127e0 100644
--- a/tests/baselines/reference/parserParameterList7.js
+++ b/tests/baselines/reference/parserParameterList7.js
@@ -11,4 +11,4 @@ var C1 = (function () {
         this.p3 = p3;
     } // OK
     return C1;
-})();
+}());
diff --git a/tests/baselines/reference/parserParameterList9.js b/tests/baselines/reference/parserParameterList9.js
index 965b92a7ef6cd..ec08b48f5729e 100644
--- a/tests/baselines/reference/parserParameterList9.js
+++ b/tests/baselines/reference/parserParameterList9.js
@@ -14,4 +14,4 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserRealSource1.js b/tests/baselines/reference/parserRealSource1.js
index d19c2242f0b60..d26e749a667ce 100644
--- a/tests/baselines/reference/parserRealSource1.js
+++ b/tests/baselines/reference/parserRealSource1.js
@@ -197,7 +197,7 @@ var TypeScript;
         NullLogger.prototype.log = function (s) {
         };
         return NullLogger;
-    })();
+    }());
     TypeScript.NullLogger = NullLogger;
     var LoggerAdapter = (function () {
         function LoggerAdapter(logger) {
@@ -217,7 +217,7 @@ var TypeScript;
             this.logger.log(s);
         };
         return LoggerAdapter;
-    })();
+    }());
     TypeScript.LoggerAdapter = LoggerAdapter;
     var BufferedLogger = (function () {
         function BufferedLogger() {
@@ -232,7 +232,7 @@ var TypeScript;
             this.logContents.push(s);
         };
         return BufferedLogger;
-    })();
+    }());
     TypeScript.BufferedLogger = BufferedLogger;
     function timeFunction(logger, funcDescription, func) {
         var start = +new Date();
diff --git a/tests/baselines/reference/parserRealSource10.js b/tests/baselines/reference/parserRealSource10.js
index f184db9173c97..255cad3ca21aa 100644
--- a/tests/baselines/reference/parserRealSource10.js
+++ b/tests/baselines/reference/parserRealSource10.js
@@ -644,7 +644,7 @@ var TypeScript;
             this.ers = ers;
         }
         return TokenInfo;
-    })();
+    }());
     TypeScript.TokenInfo = TokenInfo;
     function setTokenInfo(tokenId, reservation, binopPrecedence, binopNodeType, unopPrecedence, unopNodeType, text, ers) {
         if (tokenId !== undefined) {
@@ -790,7 +790,7 @@ var TypeScript;
             this.limChar = limChar;
         }
         return SavedToken;
-    })();
+    }());
     TypeScript.SavedToken = SavedToken;
     var Token = (function () {
         function Token(tokenId) {
@@ -821,7 +821,7 @@ var TypeScript;
             return TokenClass.Punctuation;
         };
         return Token;
-    })();
+    }());
     TypeScript.Token = Token;
     var NumberLiteralToken = (function (_super) {
         __extends(NumberLiteralToken, _super);
@@ -837,7 +837,7 @@ var TypeScript;
             return TokenClass.Literal;
         };
         return NumberLiteralToken;
-    })(Token);
+    }(Token));
     TypeScript.NumberLiteralToken = NumberLiteralToken;
     var StringLiteralToken = (function (_super) {
         __extends(StringLiteralToken, _super);
@@ -852,7 +852,7 @@ var TypeScript;
             return TokenClass.Literal;
         };
         return StringLiteralToken;
-    })(Token);
+    }(Token));
     TypeScript.StringLiteralToken = StringLiteralToken;
     var IdentifierToken = (function (_super) {
         __extends(IdentifierToken, _super);
@@ -868,7 +868,7 @@ var TypeScript;
             return TokenClass.Identifier;
         };
         return IdentifierToken;
-    })(Token);
+    }(Token));
     TypeScript.IdentifierToken = IdentifierToken;
     var WhitespaceToken = (function (_super) {
         __extends(WhitespaceToken, _super);
@@ -883,7 +883,7 @@ var TypeScript;
             return TokenClass.Whitespace;
         };
         return WhitespaceToken;
-    })(Token);
+    }(Token));
     TypeScript.WhitespaceToken = WhitespaceToken;
     var CommentToken = (function (_super) {
         __extends(CommentToken, _super);
@@ -902,7 +902,7 @@ var TypeScript;
             return TokenClass.Comment;
         };
         return CommentToken;
-    })(Token);
+    }(Token));
     TypeScript.CommentToken = CommentToken;
     var RegularExpressionLiteralToken = (function (_super) {
         __extends(RegularExpressionLiteralToken, _super);
@@ -917,7 +917,7 @@ var TypeScript;
             return TokenClass.Literal;
         };
         return RegularExpressionLiteralToken;
-    })(Token);
+    }(Token));
     TypeScript.RegularExpressionLiteralToken = RegularExpressionLiteralToken;
     // TODO: new with length TokenID.LimFixed
     TypeScript.staticTokens = new Token[];
diff --git a/tests/baselines/reference/parserRealSource11.js b/tests/baselines/reference/parserRealSource11.js
index 4091eb290d18a..0c1d106425564 100644
--- a/tests/baselines/reference/parserRealSource11.js
+++ b/tests/baselines/reference/parserRealSource11.js
@@ -2381,7 +2381,7 @@ var TypeScript;
             this.limChar = -1; // -1 = "undefined" or "compiler generated"   
         }
         return ASTSpan;
-    })();
+    }());
     TypeScript.ASTSpan = ASTSpan;
     var AST = (function (_super) {
         __extends(AST, _super);
@@ -2537,7 +2537,7 @@ var TypeScript;
             return resolved;
         };
         return AST;
-    })(ASTSpan);
+    }(ASTSpan));
     TypeScript.AST = AST;
     var IncompleteAST = (function (_super) {
         __extends(IncompleteAST, _super);
@@ -2547,7 +2547,7 @@ var TypeScript;
             this.limChar = lim;
         }
         return IncompleteAST;
-    })(AST);
+    }(AST));
     TypeScript.IncompleteAST = IncompleteAST;
     var ASTList = (function (_super) {
         __extends(ASTList, _super);
@@ -2602,7 +2602,7 @@ var TypeScript;
             return this;
         };
         return ASTList;
-    })(AST);
+    }(AST));
     TypeScript.ASTList = ASTList;
     var Identifier = (function (_super) {
         __extends(Identifier, _super);
@@ -2658,7 +2658,7 @@ var TypeScript;
             return new Identifier(token.getText(), token.hasEscapeSequence);
         };
         return Identifier;
-    })(AST);
+    }(AST));
     TypeScript.Identifier = Identifier;
     var MissingIdentifier = (function (_super) {
         __extends(MissingIdentifier, _super);
@@ -2672,7 +2672,7 @@ var TypeScript;
             // Emit nothing for a missing ID
         };
         return MissingIdentifier;
-    })(Identifier);
+    }(Identifier));
     TypeScript.MissingIdentifier = MissingIdentifier;
     var Label = (function (_super) {
         __extends(Label, _super);
@@ -2696,7 +2696,7 @@ var TypeScript;
             emitter.emitParensAndCommentsInPlace(this, false);
         };
         return Label;
-    })(AST);
+    }(AST));
     TypeScript.Label = Label;
     var Expression = (function (_super) {
         __extends(Expression, _super);
@@ -2706,7 +2706,7 @@ var TypeScript;
         Expression.prototype.isExpression = function () { return true; };
         Expression.prototype.isStatementOrExpression = function () { return true; };
         return Expression;
-    })(AST);
+    }(AST));
     TypeScript.Expression = Expression;
     var UnaryExpression = (function (_super) {
         __extends(UnaryExpression, _super);
@@ -2850,7 +2850,7 @@ var TypeScript;
             emitter.emitParensAndCommentsInPlace(this, false);
         };
         return UnaryExpression;
-    })(Expression);
+    }(Expression));
     TypeScript.UnaryExpression = UnaryExpression;
     var CallExpression = (function (_super) {
         __extends(CallExpression, _super);
@@ -2882,7 +2882,7 @@ var TypeScript;
             emitter.emitParensAndCommentsInPlace(this, false);
         };
         return CallExpression;
-    })(Expression);
+    }(Expression));
     TypeScript.CallExpression = CallExpression;
     var BinaryExpression = (function (_super) {
         __extends(BinaryExpression, _super);
@@ -3034,7 +3034,7 @@ var TypeScript;
             emitter.emitParensAndCommentsInPlace(this, false);
         };
         return BinaryExpression;
-    })(Expression);
+    }(Expression));
     TypeScript.BinaryExpression = BinaryExpression;
     var ConditionalExpression = (function (_super) {
         __extends(ConditionalExpression, _super);
@@ -3059,7 +3059,7 @@ var TypeScript;
             emitter.emitParensAndCommentsInPlace(this, false);
         };
         return ConditionalExpression;
-    })(Expression);
+    }(Expression));
     TypeScript.ConditionalExpression = ConditionalExpression;
     var NumberLiteral = (function (_super) {
         __extends(NumberLiteral, _super);
@@ -3100,7 +3100,7 @@ var TypeScript;
             }
         };
         return NumberLiteral;
-    })(Expression);
+    }(Expression));
     TypeScript.NumberLiteral = NumberLiteral;
     var RegexLiteral = (function (_super) {
         __extends(RegexLiteral, _super);
@@ -3120,7 +3120,7 @@ var TypeScript;
             emitter.emitParensAndCommentsInPlace(this, false);
         };
         return RegexLiteral;
-    })(Expression);
+    }(Expression));
     TypeScript.RegexLiteral = RegexLiteral;
     var StringLiteral = (function (_super) {
         __extends(StringLiteral, _super);
@@ -3146,7 +3146,7 @@ var TypeScript;
             return this.text;
         };
         return StringLiteral;
-    })(Expression);
+    }(Expression));
     TypeScript.StringLiteral = StringLiteral;
     var ModuleElement = (function (_super) {
         __extends(ModuleElement, _super);
@@ -3154,7 +3154,7 @@ var TypeScript;
             _super.call(this, nodeType);
         }
         return ModuleElement;
-    })(AST);
+    }(AST));
     TypeScript.ModuleElement = ModuleElement;
     var ImportDeclaration = (function (_super) {
         __extends(ImportDeclaration, _super);
@@ -3213,7 +3213,7 @@ var TypeScript;
             }
         };
         return ImportDeclaration;
-    })(ModuleElement);
+    }(ModuleElement));
     TypeScript.ImportDeclaration = ImportDeclaration;
     var BoundDecl = (function (_super) {
         __extends(BoundDecl, _super);
@@ -3237,7 +3237,7 @@ var TypeScript;
             return this.treeViewLabel();
         };
         return BoundDecl;
-    })(AST);
+    }(AST));
     TypeScript.BoundDecl = BoundDecl;
     var VarDecl = (function (_super) {
         __extends(VarDecl, _super);
@@ -3254,7 +3254,7 @@ var TypeScript;
             return "var " + this.id.actualText;
         };
         return VarDecl;
-    })(BoundDecl);
+    }(BoundDecl));
     TypeScript.VarDecl = VarDecl;
     var ArgDecl = (function (_super) {
         __extends(ArgDecl, _super);
@@ -3275,7 +3275,7 @@ var TypeScript;
             emitter.emitParensAndCommentsInPlace(this, false);
         };
         return ArgDecl;
-    })(BoundDecl);
+    }(BoundDecl));
     TypeScript.ArgDecl = ArgDecl;
     var internalId = 0;
     var FuncDecl = (function (_super) {
@@ -3406,7 +3406,7 @@ var TypeScript;
         FuncDecl.prototype.isSignature = function () { return (this.fncFlags & FncFlags.Signature) != FncFlags.None; };
         FuncDecl.prototype.hasStaticDeclarations = function () { return (!this.isConstructor && (this.statics.members.length > 0 || this.innerStaticFuncs.length > 0)); };
         return FuncDecl;
-    })(AST);
+    }(AST));
     TypeScript.FuncDecl = FuncDecl;
     var LocationInfo = (function () {
         function LocationInfo(filename, lineMap, unitIndex) {
@@ -3415,7 +3415,7 @@ var TypeScript;
             this.unitIndex = unitIndex;
         }
         return LocationInfo;
-    })();
+    }());
     TypeScript.LocationInfo = LocationInfo;
     TypeScript.unknownLocationInfo = new LocationInfo("unknown", null, -1);
     var Script = (function (_super) {
@@ -3485,7 +3485,7 @@ var TypeScript;
             }
         };
         return Script;
-    })(FuncDecl);
+    }(FuncDecl));
     TypeScript.Script = Script;
     var NamedDeclaration = (function (_super) {
         __extends(NamedDeclaration, _super);
@@ -3497,7 +3497,7 @@ var TypeScript;
             this.rightCurlyCount = 0;
         }
         return NamedDeclaration;
-    })(ModuleElement);
+    }(ModuleElement));
     TypeScript.NamedDeclaration = NamedDeclaration;
     var ModuleDeclaration = (function (_super) {
         __extends(ModuleDeclaration, _super);
@@ -3532,7 +3532,7 @@ var TypeScript;
             }
         };
         return ModuleDeclaration;
-    })(NamedDeclaration);
+    }(NamedDeclaration));
     TypeScript.ModuleDeclaration = ModuleDeclaration;
     var TypeDeclaration = (function (_super) {
         __extends(TypeDeclaration, _super);
@@ -3549,7 +3549,7 @@ var TypeScript;
             return hasFlag(this.varFlags, VarFlags.Ambient);
         };
         return TypeDeclaration;
-    })(NamedDeclaration);
+    }(NamedDeclaration));
     TypeScript.TypeDeclaration = TypeDeclaration;
     var ClassDeclaration = (function (_super) {
         __extends(ClassDeclaration, _super);
@@ -3567,7 +3567,7 @@ var TypeScript;
             emitter.emitJavascriptClass(this);
         };
         return ClassDeclaration;
-    })(TypeDeclaration);
+    }(TypeDeclaration));
     TypeScript.ClassDeclaration = ClassDeclaration;
     var InterfaceDeclaration = (function (_super) {
         __extends(InterfaceDeclaration, _super);
@@ -3580,7 +3580,7 @@ var TypeScript;
         InterfaceDeclaration.prototype.emit = function (emitter, tokenId, startLine) {
         };
         return InterfaceDeclaration;
-    })(TypeDeclaration);
+    }(TypeDeclaration));
     TypeScript.InterfaceDeclaration = InterfaceDeclaration;
     var Statement = (function (_super) {
         __extends(Statement, _super);
@@ -3596,7 +3596,7 @@ var TypeScript;
             return this;
         };
         return Statement;
-    })(ModuleElement);
+    }(ModuleElement));
     TypeScript.Statement = Statement;
     var LabeledStatement = (function (_super) {
         __extends(LabeledStatement, _super);
@@ -3630,7 +3630,7 @@ var TypeScript;
             beforeBB.addSuccessor(bb);
         };
         return LabeledStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.LabeledStatement = LabeledStatement;
     var Block = (function (_super) {
         __extends(Block, _super);
@@ -3685,7 +3685,7 @@ var TypeScript;
             return this;
         };
         return Block;
-    })(Statement);
+    }(Statement));
     TypeScript.Block = Block;
     var Jump = (function (_super) {
         __extends(Jump, _super);
@@ -3736,7 +3736,7 @@ var TypeScript;
             emitter.emitParensAndCommentsInPlace(this, false);
         };
         return Jump;
-    })(Statement);
+    }(Statement));
     TypeScript.Jump = Jump;
     var WhileStatement = (function (_super) {
         __extends(WhileStatement, _super);
@@ -3788,7 +3788,7 @@ var TypeScript;
             context.walker.options.goChildren = false;
         };
         return WhileStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.WhileStatement = WhileStatement;
     var DoWhileStatement = (function (_super) {
         __extends(DoWhileStatement, _super);
@@ -3844,7 +3844,7 @@ var TypeScript;
             context.walker.options.goChildren = false;
         };
         return DoWhileStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.DoWhileStatement = DoWhileStatement;
     var IfStatement = (function (_super) {
         __extends(IfStatement, _super);
@@ -3922,7 +3922,7 @@ var TypeScript;
             context.walker.options.goChildren = false;
         };
         return IfStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.IfStatement = IfStatement;
     var ReturnStatement = (function (_super) {
         __extends(ReturnStatement, _super);
@@ -3953,7 +3953,7 @@ var TypeScript;
             return typeFlow.typeCheckReturn(this);
         };
         return ReturnStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.ReturnStatement = ReturnStatement;
     var EndCode = (function (_super) {
         __extends(EndCode, _super);
@@ -3961,7 +3961,7 @@ var TypeScript;
             _super.call(this, NodeType.EndCode);
         }
         return EndCode;
-    })(AST);
+    }(AST));
     TypeScript.EndCode = EndCode;
     var ForInStatement = (function (_super) {
         __extends(ForInStatement, _super);
@@ -4076,7 +4076,7 @@ var TypeScript;
             context.walker.options.goChildren = false;
         };
         return ForInStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.ForInStatement = ForInStatement;
     var ForStatement = (function (_super) {
         __extends(ForStatement, _super);
@@ -4167,7 +4167,7 @@ var TypeScript;
             context.walker.options.goChildren = false;
         };
         return ForStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.ForStatement = ForStatement;
     var WithStatement = (function (_super) {
         __extends(WithStatement, _super);
@@ -4193,7 +4193,7 @@ var TypeScript;
             return typeFlow.typeCheckWith(this);
         };
         return WithStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.WithStatement = WithStatement;
     var SwitchStatement = (function (_super) {
         __extends(SwitchStatement, _super);
@@ -4265,7 +4265,7 @@ var TypeScript;
             context.walker.options.goChildren = false;
         };
         return SwitchStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.SwitchStatement = SwitchStatement;
     var CaseStatement = (function (_super) {
         __extends(CaseStatement, _super);
@@ -4318,7 +4318,7 @@ var TypeScript;
             context.walker.options.goChildren = false;
         };
         return CaseStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.CaseStatement = CaseStatement;
     var TypeReference = (function (_super) {
         __extends(TypeReference, _super);
@@ -4348,7 +4348,7 @@ var TypeScript;
             return this;
         };
         return TypeReference;
-    })(AST);
+    }(AST));
     TypeScript.TypeReference = TypeReference;
     var TryFinally = (function (_super) {
         __extends(TryFinally, _super);
@@ -4393,7 +4393,7 @@ var TypeScript;
             context.walker.options.goChildren = false;
         };
         return TryFinally;
-    })(Statement);
+    }(Statement));
     TypeScript.TryFinally = TryFinally;
     var TryCatch = (function (_super) {
         __extends(TryCatch, _super);
@@ -4443,7 +4443,7 @@ var TypeScript;
             return this;
         };
         return TryCatch;
-    })(Statement);
+    }(Statement));
     TypeScript.TryCatch = TryCatch;
     var Try = (function (_super) {
         __extends(Try, _super);
@@ -4471,7 +4471,7 @@ var TypeScript;
             context.noContinuation = false;
         };
         return Try;
-    })(Statement);
+    }(Statement));
     TypeScript.Try = Try;
     var Catch = (function (_super) {
         __extends(Catch, _super);
@@ -4544,7 +4544,7 @@ var TypeScript;
             return this;
         };
         return Catch;
-    })(Statement);
+    }(Statement));
     TypeScript.Catch = Catch;
     var Finally = (function (_super) {
         __extends(Finally, _super);
@@ -4572,7 +4572,7 @@ var TypeScript;
             return this;
         };
         return Finally;
-    })(Statement);
+    }(Statement));
     TypeScript.Finally = Finally;
     var Comment = (function (_super) {
         __extends(Comment, _super);
@@ -4598,7 +4598,7 @@ var TypeScript;
             return this.text;
         };
         return Comment;
-    })(AST);
+    }(AST));
     TypeScript.Comment = Comment;
     var DebuggerStatement = (function (_super) {
         __extends(DebuggerStatement, _super);
@@ -4613,6 +4613,6 @@ var TypeScript;
             emitter.emitParensAndCommentsInPlace(this, false);
         };
         return DebuggerStatement;
-    })(Statement);
+    }(Statement));
     TypeScript.DebuggerStatement = DebuggerStatement;
 })(TypeScript || (TypeScript = {}));
diff --git a/tests/baselines/reference/parserRealSource12.js b/tests/baselines/reference/parserRealSource12.js
index 831c121ab085f..fccb1fa45e087 100644
--- a/tests/baselines/reference/parserRealSource12.js
+++ b/tests/baselines/reference/parserRealSource12.js
@@ -548,7 +548,7 @@ var TypeScript;
             this.goNextSibling = !stop;
         };
         return AstWalkOptions;
-    })();
+    }());
     TypeScript.AstWalkOptions = AstWalkOptions;
     var AstWalker = (function () {
         function AstWalker(childrenWalkers, pre, post, options, state) {
@@ -586,7 +586,7 @@ var TypeScript;
             }
         };
         return AstWalker;
-    })();
+    }());
     var AstWalkerFactory = (function () {
         function AstWalkerFactory() {
             this.childrenWalkers = [];
@@ -720,7 +720,7 @@ var TypeScript;
             }
         };
         return AstWalkerFactory;
-    })();
+    }());
     TypeScript.AstWalkerFactory = AstWalkerFactory;
     var globalAstWalkerFactory;
     function getAstWalkerFactory() {
diff --git a/tests/baselines/reference/parserRealSource14.js b/tests/baselines/reference/parserRealSource14.js
index 4312cb385171c..c31a9dd6c7244 100644
--- a/tests/baselines/reference/parserRealSource14.js
+++ b/tests/baselines/reference/parserRealSource14.js
@@ -940,7 +940,7 @@ var TypeScript;
                 this.asts[this.top - 0].isStatementBlock === false;
         };
         return AstPath;
-    })();
+    }());
     TypeScript.AstPath = AstPath;
     function isValidAstNode(ast) {
         if (ast === null)
@@ -955,7 +955,7 @@ var TypeScript;
             this.path = new TypeScript.AstPath();
         }
         return AstPathContext;
-    })();
+    }());
     TypeScript.AstPathContext = AstPathContext;
     (function (GetAstPathOptions) {
         GetAstPathOptions[GetAstPathOptions["Default"] = 0] = "Default";
diff --git a/tests/baselines/reference/parserRealSource4.js b/tests/baselines/reference/parserRealSource4.js
index 563e9e92a08ca..c06bd191fb563 100644
--- a/tests/baselines/reference/parserRealSource4.js
+++ b/tests/baselines/reference/parserRealSource4.js
@@ -314,7 +314,7 @@ var TypeScript;
             this["constructor"] = undefined;
         }
         return BlockIntrinsics;
-    })();
+    }());
     TypeScript.BlockIntrinsics = BlockIntrinsics;
     var StringHashTable = (function () {
         function StringHashTable() {
@@ -388,7 +388,7 @@ var TypeScript;
             }
         };
         return StringHashTable;
-    })();
+    }());
     TypeScript.StringHashTable = StringHashTable;
     // The resident table is expected to reference the same table object, whereas the 
     // transientTable may reference different objects over time
@@ -441,7 +441,7 @@ var TypeScript;
             }
         };
         return DualStringHashTable;
-    })();
+    }());
     TypeScript.DualStringHashTable = DualStringHashTable;
     function numberHashFn(key) {
         var c2 = 0x27d4eb2d; // a prime or an odd constant
@@ -463,7 +463,7 @@ var TypeScript;
             this.data = data;
         }
         return HashEntry;
-    })();
+    }());
     TypeScript.HashEntry = HashEntry;
     var HashTable = (function () {
         function HashTable(size, hashFn, equalsFn) {
@@ -526,7 +526,7 @@ var TypeScript;
             return (null);
         };
         return HashTable;
-    })();
+    }());
     TypeScript.HashTable = HashTable;
     // Simple Hash table with list of keys and values matching each other at the given index
     var SimpleHashTable = (function () {
@@ -559,6 +559,6 @@ var TypeScript;
             return true;
         };
         return SimpleHashTable;
-    })();
+    }());
     TypeScript.SimpleHashTable = SimpleHashTable;
 })(TypeScript || (TypeScript = {}));
diff --git a/tests/baselines/reference/parserRealSource5.js b/tests/baselines/reference/parserRealSource5.js
index 9c64899fab7c6..4f4db59746e34 100644
--- a/tests/baselines/reference/parserRealSource5.js
+++ b/tests/baselines/reference/parserRealSource5.js
@@ -111,7 +111,7 @@ var TypeScript;
             this.builder = "";
         };
         return PrintContext;
-    })();
+    }());
     TypeScript.PrintContext = PrintContext;
     function prePrintAST(ast, parent, walker) {
         var pc = walker.state;
diff --git a/tests/baselines/reference/parserRealSource6.js b/tests/baselines/reference/parserRealSource6.js
index d65207b8c77bc..c7dcc5e497bfa 100644
--- a/tests/baselines/reference/parserRealSource6.js
+++ b/tests/baselines/reference/parserRealSource6.js
@@ -234,7 +234,7 @@ var TypeScript;
             this.script = null;
         }
         return TypeCollectionContext;
-    })();
+    }());
     TypeScript.TypeCollectionContext = TypeCollectionContext;
     var MemberScopeContext = (function () {
         function MemberScopeContext(flow, pos, matchFlag) {
@@ -246,7 +246,7 @@ var TypeScript;
             this.options = new AstWalkOptions();
         }
         return MemberScopeContext;
-    })();
+    }());
     TypeScript.MemberScopeContext = MemberScopeContext;
     var EnclosingScopeContext = (function () {
         function EnclosingScopeContext(logger, script, text, pos, isMemberCompletion) {
@@ -293,7 +293,7 @@ var TypeScript;
             return this.scriptFragment;
         };
         return EnclosingScopeContext;
-    })();
+    }());
     TypeScript.EnclosingScopeContext = EnclosingScopeContext;
     function preFindMemberScope(ast, parent, walker) {
         var memScope = walker.state;
diff --git a/tests/baselines/reference/parserRealSource7.js b/tests/baselines/reference/parserRealSource7.js
index 5073c33febde4..edc290c35d82a 100644
--- a/tests/baselines/reference/parserRealSource7.js
+++ b/tests/baselines/reference/parserRealSource7.js
@@ -845,7 +845,7 @@ var TypeScript;
             this.exceptionBlock = -1;
         }
         return Continuation;
-    })();
+    }());
     TypeScript.Continuation = Continuation;
     function getBaseTypeLinks(bases, baseTypeLinks) {
         if (bases) {
diff --git a/tests/baselines/reference/parserRealSource8.js b/tests/baselines/reference/parserRealSource8.js
index 8a667ad6dbee1..d23297954bec9 100644
--- a/tests/baselines/reference/parserRealSource8.js
+++ b/tests/baselines/reference/parserRealSource8.js
@@ -479,7 +479,7 @@ var TypeScript;
             this.modDeclChain = modDeclChain;
         }
         return AssignScopeContext;
-    })();
+    }());
     TypeScript.AssignScopeContext = AssignScopeContext;
     function pushAssignScope(scope, context, type, classType, fnc) {
         var chain = new ScopeChain(null, context.scopeChain, scope);
@@ -525,7 +525,7 @@ var TypeScript;
             }
         };
         return ScopeSearchFilter;
-    })();
+    }());
     TypeScript.ScopeSearchFilter = ScopeSearchFilter;
     TypeScript.instanceFilter = new ScopeSearchFilter(instanceCompare, instanceFilterStop);
     function preAssignModuleScopes(ast, context) {
diff --git a/tests/baselines/reference/parserRealSource9.js b/tests/baselines/reference/parserRealSource9.js
index dba28c4f295f4..e278f88c8e9fe 100644
--- a/tests/baselines/reference/parserRealSource9.js
+++ b/tests/baselines/reference/parserRealSource9.js
@@ -396,6 +396,6 @@ var TypeScript;
             }, this);
         };
         return Binder;
-    })();
+    }());
     TypeScript.Binder = Binder;
 })(TypeScript || (TypeScript = {}));
diff --git a/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.js b/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.js
index 0cbae53aac317..065605fe9d4c4 100644
--- a/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.js
+++ b/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.js
@@ -15,4 +15,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js
index 651640c646667..ca07292ee540a 100644
--- a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js
+++ b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserSuperExpression1.js b/tests/baselines/reference/parserSuperExpression1.js
index 0d219afad37c9..02bd49653fe6e 100644
--- a/tests/baselines/reference/parserSuperExpression1.js
+++ b/tests/baselines/reference/parserSuperExpression1.js
@@ -21,7 +21,7 @@ var C = (function () {
         _super.prototype.foo.call(this);
     };
     return C;
-})();
+}());
 var M1;
 (function (M1) {
     var M2;
@@ -33,6 +33,6 @@ var M1;
                 _super.prototype.foo.call(this);
             };
             return C;
-        })();
+        }());
     })(M2 = M1.M2 || (M1.M2 = {}));
 })(M1 || (M1 = {}));
diff --git a/tests/baselines/reference/parserSuperExpression2.js b/tests/baselines/reference/parserSuperExpression2.js
index eb3c2c697e67e..ebd43ad318033 100644
--- a/tests/baselines/reference/parserSuperExpression2.js
+++ b/tests/baselines/reference/parserSuperExpression2.js
@@ -13,4 +13,4 @@ var C = (function () {
         _super.prototype..call(this, 0);
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserSuperExpression3.js b/tests/baselines/reference/parserSuperExpression3.js
index b8ae4257c7938..f311efcd0f6a8 100644
--- a/tests/baselines/reference/parserSuperExpression3.js
+++ b/tests/baselines/reference/parserSuperExpression3.js
@@ -13,4 +13,4 @@ var C = (function () {
         this.super(0);
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/parserSuperExpression4.js b/tests/baselines/reference/parserSuperExpression4.js
index 59ba63bb2cff9..97f6ad26c4b63 100644
--- a/tests/baselines/reference/parserSuperExpression4.js
+++ b/tests/baselines/reference/parserSuperExpression4.js
@@ -21,7 +21,7 @@ var C = (function () {
         _super.prototype.foo = 1;
     };
     return C;
-})();
+}());
 var M1;
 (function (M1) {
     var M2;
@@ -33,6 +33,6 @@ var M1;
                 _super.prototype.foo = 1;
             };
             return C;
-        })();
+        }());
     })(M2 = M1.M2 || (M1.M2 = {}));
 })(M1 || (M1 = {}));
diff --git a/tests/baselines/reference/parserUnicode3.js b/tests/baselines/reference/parserUnicode3.js
index 6d4daa539eef6..30652e90cfaa1 100644
--- a/tests/baselines/reference/parserUnicode3.js
+++ b/tests/baselines/reference/parserUnicode3.js
@@ -7,4 +7,4 @@ var 剩下 = (function () {
     function 剩下() {
     }
     return 剩下;
-})();
+}());
diff --git a/tests/baselines/reference/parserharness.js b/tests/baselines/reference/parserharness.js
index 296aae05fad4a..6b38a8c9e4cc7 100644
--- a/tests/baselines/reference/parserharness.js
+++ b/tests/baselines/reference/parserharness.js
@@ -2282,7 +2282,7 @@ var Harness;
         Logger.prototype.comment = function (comment) { };
         Logger.prototype.verify = function (test, passed, actual, expected, message) { };
         return Logger;
-    })();
+    }());
     Harness.Logger = Logger;
     // Logger-related functions
     var loggers = [];
@@ -2375,7 +2375,7 @@ var Harness;
         Runnable.currentStack = [];
         Runnable.errorHandlerStack = [];
         return Runnable;
-    })();
+    }());
     Harness.Runnable = Runnable;
     var TestCase = (function (_super) {
         __extends(TestCase, _super);
@@ -2409,7 +2409,7 @@ var Harness;
             }
         };
         return TestCase;
-    })(Runnable);
+    }(Runnable));
     Harness.TestCase = TestCase;
     var Scenario = (function (_super) {
         __extends(Scenario, _super);
@@ -2464,7 +2464,7 @@ var Harness;
             done();
         };
         return Scenario;
-    })(Runnable);
+    }(Runnable));
     Harness.Scenario = Scenario;
     var Run = (function (_super) {
         __extends(Run, _super);
@@ -2495,7 +2495,7 @@ var Harness;
             emitLog('end');
         };
         return Run;
-    })(Runnable);
+    }(Runnable));
     Harness.Run = Run;
     // Performance test
     var Perf;
@@ -2530,7 +2530,7 @@ var Harness;
                 this.time = (Clock.now() - this.startTime) / Clock.resolution * 1000;
             };
             return Timer;
-        })();
+        }());
         Perf.Timer = Timer;
         var Dataset = (function () {
             function Dataset() {
@@ -2573,7 +2573,7 @@ var Harness;
                 return Math.sqrt(sumOfSquares / this.data.length);
             };
             return Dataset;
-        })();
+        }());
         Perf.Dataset = Dataset;
         // Base benchmark class with some defaults.
         var Benchmark = (function () {
@@ -2592,7 +2592,7 @@ var Harness;
                 this.results[name].add(timing);
             };
             return Benchmark;
-        })();
+        }());
         Perf.Benchmark = Benchmark;
         Perf.benchmarks = [];
         var timeFunction;
@@ -2673,7 +2673,7 @@ var Harness;
                 this.currentLine = "";
             };
             return WriterAggregator;
-        })();
+        }());
         Compiler.WriterAggregator = WriterAggregator;
         /** Mimics having multiple files, later concatenated to a single file. */
         var EmitterIOHost = (function () {
@@ -2709,7 +2709,7 @@ var Harness;
                 return result;
             };
             return EmitterIOHost;
-        })();
+        }());
         Compiler.EmitterIOHost = EmitterIOHost;
         var libFolder = global['WScript'] ? TypeScript.filePath(global['WScript'].ScriptFullName) : (__dirname + '/');
         Compiler.libText = IO ? IO.readFile(libFolder + "lib.d.ts") : '';
@@ -2873,7 +2873,7 @@ var Harness;
                 });
             };
             return Type;
-        })();
+        }());
         Compiler.Type = Type;
         var TypeFactory = (function () {
             function TypeFactory() {
@@ -3014,7 +3014,7 @@ var Harness;
                 });
             };
             return TypeFactory;
-        })();
+        }());
         Compiler.TypeFactory = TypeFactory;
         /** Generates a .d.ts file for the given code
           * @param verifyNoDeclFile pass true when the given code should generate no decl file, false otherwise
@@ -3110,7 +3110,7 @@ var Harness;
                 return false;
             };
             return CompilerResult;
-        })();
+        }());
         Compiler.CompilerResult = CompilerResult;
         // Compiler Error.
         var CompilerError = (function () {
@@ -3124,7 +3124,7 @@ var Harness;
                 return this.file + "(" + this.line + "," + this.column + "): " + this.message;
             };
             return CompilerError;
-        })();
+        }());
         Compiler.CompilerError = CompilerError;
         /** Create a new instance of the compiler with default settings and lib.d.ts, then typecheck */
         function recreate() {
@@ -3452,7 +3452,7 @@ var Harness;
             return new TypeScript.ScriptEditRange(minDistFromStart, entries[0].length - minDistFromEnd, aggDelta);
         };
         return ScriptInfo;
-    })();
+    }());
     Harness.ScriptInfo = ScriptInfo;
     var TypeScriptLS = (function () {
         function TypeScriptLS() {
@@ -3654,7 +3654,7 @@ var Harness;
             return JSON.stringify({ usePullLanguageService: Harness.usePull });
         };
         return TypeScriptLS;
-    })();
+    }());
     Harness.TypeScriptLS = TypeScriptLS;
     // Describe/it definitions
     function describe(description, block) {
diff --git a/tests/baselines/reference/parserindenter.js b/tests/baselines/reference/parserindenter.js
index a60eadc66a1da..8beb239374843 100644
--- a/tests/baselines/reference/parserindenter.js
+++ b/tests/baselines/reference/parserindenter.js
@@ -1340,6 +1340,6 @@ var Formatting;
                 this.snapshot.GetLineNumberFromPosition(token.Span.endPosition()) > this.snapshot.GetLineNumberFromPosition(token.Span.startPosition());
         };
         return Indenter;
-    })();
+    }());
     Formatting.Indenter = Indenter;
 })(Formatting || (Formatting = {}));
diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js
index 59129f91b97df..de5777feca800 100644
--- a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js
+++ b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.js
@@ -12,4 +12,4 @@ var C = (function () {
     C.prototype.f = function () { };
     ;
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/partiallyAmbientClodule.js b/tests/baselines/reference/partiallyAmbientClodule.js
index 52077a4b4ad34..f721d032f343d 100644
--- a/tests/baselines/reference/partiallyAmbientClodule.js
+++ b/tests/baselines/reference/partiallyAmbientClodule.js
@@ -9,4 +9,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})(); // Legal, because module is ambient
+}()); // Legal, because module is ambient
diff --git a/tests/baselines/reference/pinnedComments1.js b/tests/baselines/reference/pinnedComments1.js
index 9ab2a147e6a39..18bdcc982b067 100644
--- a/tests/baselines/reference/pinnedComments1.js
+++ b/tests/baselines/reference/pinnedComments1.js
@@ -18,4 +18,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/plusOperatorWithAnyOtherType.js b/tests/baselines/reference/plusOperatorWithAnyOtherType.js
index 0356bad198e06..6c24aa68806ca 100644
--- a/tests/baselines/reference/plusOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/plusOperatorWithAnyOtherType.js
@@ -75,7 +75,7 @@ var A = (function () {
         return a;
     };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.js b/tests/baselines/reference/plusOperatorWithBooleanType.js
index d48066707aac9..1bd72bb6ea77a 100644
--- a/tests/baselines/reference/plusOperatorWithBooleanType.js
+++ b/tests/baselines/reference/plusOperatorWithBooleanType.js
@@ -44,7 +44,7 @@ var A = (function () {
     }
     A.foo = function () { return false; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.js b/tests/baselines/reference/plusOperatorWithNumberType.js
index 8da631aa7a828..377577194bbd4 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.js
+++ b/tests/baselines/reference/plusOperatorWithNumberType.js
@@ -51,7 +51,7 @@ var A = (function () {
     }
     A.foo = function () { return 1; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/plusOperatorWithStringType.js b/tests/baselines/reference/plusOperatorWithStringType.js
index dbe7e23a3d618..19d143eeb8e57 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.js
+++ b/tests/baselines/reference/plusOperatorWithStringType.js
@@ -50,7 +50,7 @@ var A = (function () {
     }
     A.foo = function () { return ""; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/prespecializedGenericMembers1.js b/tests/baselines/reference/prespecializedGenericMembers1.js
index c53a6f2ee691d..dd6bd2a2dc673 100644
--- a/tests/baselines/reference/prespecializedGenericMembers1.js
+++ b/tests/baselines/reference/prespecializedGenericMembers1.js
@@ -26,13 +26,13 @@ var Cat = (function () {
     function Cat() {
     }
     return Cat;
-})();
+}());
 exports.Cat = Cat;
 var CatBag = (function () {
     function CatBag(cats) {
     }
     return CatBag;
-})();
+}());
 exports.CatBag = CatBag;
 var cat = new Cat();
 var catThing = {
diff --git a/tests/baselines/reference/primitiveConstraints2.js b/tests/baselines/reference/primitiveConstraints2.js
index 4ce8480ae0eb2..c8c49b2a16487 100644
--- a/tests/baselines/reference/primitiveConstraints2.js
+++ b/tests/baselines/reference/primitiveConstraints2.js
@@ -17,7 +17,7 @@ var C = (function () {
         return null;
     };
     return C;
-})();
+}());
 var x = new C();
 x.bar2(2, ""); // should error
 x.bar2(2, ""); // should error
diff --git a/tests/baselines/reference/primitiveMembers.js b/tests/baselines/reference/primitiveMembers.js
index 60ae4b79dec7d..caf41fe27086a 100644
--- a/tests/baselines/reference/primitiveMembers.js
+++ b/tests/baselines/reference/primitiveMembers.js
@@ -59,7 +59,7 @@ var baz = (function () {
     baz.prototype.bar = function () { };
     ;
     return baz;
-})();
+}());
 var foo = (function (_super) {
     __extends(foo, _super);
     function foo() {
@@ -68,4 +68,4 @@ var foo = (function (_super) {
     foo.prototype.bar = function () { return undefined; };
     ;
     return foo;
-})(baz);
+}(baz));
diff --git a/tests/baselines/reference/primitiveTypeAsClassName.js b/tests/baselines/reference/primitiveTypeAsClassName.js
index 5890e53d14451..f68d64f9444b1 100644
--- a/tests/baselines/reference/primitiveTypeAsClassName.js
+++ b/tests/baselines/reference/primitiveTypeAsClassName.js
@@ -6,4 +6,4 @@ var any = (function () {
     function any() {
     }
     return any;
-})();
+}());
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js
index efd96c4442b12..6fed8b8f08286 100644
--- a/tests/baselines/reference/privacyAccessorDeclFile.js
+++ b/tests/baselines/reference/privacyAccessorDeclFile.js
@@ -1065,12 +1065,12 @@ var privateClass = (function () {
     function privateClass() {
     }
     return privateClass;
-})();
+}());
 var publicClass = (function () {
     function publicClass() {
     }
     return publicClass;
-})();
+}());
 exports.publicClass = publicClass;
 var publicClassWithWithPrivateGetAccessorTypes = (function () {
     function publicClassWithWithPrivateGetAccessorTypes() {
@@ -1132,7 +1132,7 @@ var publicClassWithWithPrivateGetAccessorTypes = (function () {
         configurable: true
     });
     return publicClassWithWithPrivateGetAccessorTypes;
-})();
+}());
 exports.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
 var publicClassWithWithPublicGetAccessorTypes = (function () {
     function publicClassWithWithPublicGetAccessorTypes() {
@@ -1194,7 +1194,7 @@ var publicClassWithWithPublicGetAccessorTypes = (function () {
         configurable: true
     });
     return publicClassWithWithPublicGetAccessorTypes;
-})();
+}());
 exports.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
 var privateClassWithWithPrivateGetAccessorTypes = (function () {
     function privateClassWithWithPrivateGetAccessorTypes() {
@@ -1256,7 +1256,7 @@ var privateClassWithWithPrivateGetAccessorTypes = (function () {
         configurable: true
     });
     return privateClassWithWithPrivateGetAccessorTypes;
-})();
+}());
 var privateClassWithWithPublicGetAccessorTypes = (function () {
     function privateClassWithWithPublicGetAccessorTypes() {
     }
@@ -1317,7 +1317,7 @@ var privateClassWithWithPublicGetAccessorTypes = (function () {
         configurable: true
     });
     return privateClassWithWithPublicGetAccessorTypes;
-})();
+}());
 var publicClassWithWithPrivateSetAccessorTypes = (function () {
     function publicClassWithWithPrivateSetAccessorTypes() {
     }
@@ -1346,7 +1346,7 @@ var publicClassWithWithPrivateSetAccessorTypes = (function () {
         configurable: true
     });
     return publicClassWithWithPrivateSetAccessorTypes;
-})();
+}());
 exports.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
 var publicClassWithWithPublicSetAccessorTypes = (function () {
     function publicClassWithWithPublicSetAccessorTypes() {
@@ -1376,7 +1376,7 @@ var publicClassWithWithPublicSetAccessorTypes = (function () {
         configurable: true
     });
     return publicClassWithWithPublicSetAccessorTypes;
-})();
+}());
 exports.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
 var privateClassWithWithPrivateSetAccessorTypes = (function () {
     function privateClassWithWithPrivateSetAccessorTypes() {
@@ -1406,7 +1406,7 @@ var privateClassWithWithPrivateSetAccessorTypes = (function () {
         configurable: true
     });
     return privateClassWithWithPrivateSetAccessorTypes;
-})();
+}());
 var privateClassWithWithPublicSetAccessorTypes = (function () {
     function privateClassWithWithPublicSetAccessorTypes() {
     }
@@ -1435,7 +1435,7 @@ var privateClassWithWithPublicSetAccessorTypes = (function () {
         configurable: true
     });
     return privateClassWithWithPublicSetAccessorTypes;
-})();
+}());
 var publicClassWithPrivateModuleGetAccessorTypes = (function () {
     function publicClassWithPrivateModuleGetAccessorTypes() {
     }
@@ -1468,7 +1468,7 @@ var publicClassWithPrivateModuleGetAccessorTypes = (function () {
         configurable: true
     });
     return publicClassWithPrivateModuleGetAccessorTypes;
-})();
+}());
 exports.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
 var publicClassWithPrivateModuleSetAccessorTypes = (function () {
     function publicClassWithPrivateModuleSetAccessorTypes() {
@@ -1486,7 +1486,7 @@ var publicClassWithPrivateModuleSetAccessorTypes = (function () {
         configurable: true
     });
     return publicClassWithPrivateModuleSetAccessorTypes;
-})();
+}());
 exports.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
 var privateClassWithPrivateModuleGetAccessorTypes = (function () {
     function privateClassWithPrivateModuleGetAccessorTypes() {
@@ -1520,7 +1520,7 @@ var privateClassWithPrivateModuleGetAccessorTypes = (function () {
         configurable: true
     });
     return privateClassWithPrivateModuleGetAccessorTypes;
-})();
+}());
 var privateClassWithPrivateModuleSetAccessorTypes = (function () {
     function privateClassWithPrivateModuleSetAccessorTypes() {
     }
@@ -1537,19 +1537,19 @@ var privateClassWithPrivateModuleSetAccessorTypes = (function () {
         configurable: true
     });
     return privateClassWithPrivateModuleSetAccessorTypes;
-})();
+}());
 var publicModule;
 (function (publicModule) {
     var privateClass = (function () {
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     publicModule.publicClass = publicClass;
     var publicClassWithWithPrivateGetAccessorTypes = (function () {
         function publicClassWithWithPrivateGetAccessorTypes() {
@@ -1611,7 +1611,7 @@ var publicModule;
             configurable: true
         });
         return publicClassWithWithPrivateGetAccessorTypes;
-    })();
+    }());
     publicModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
     var publicClassWithWithPublicGetAccessorTypes = (function () {
         function publicClassWithWithPublicGetAccessorTypes() {
@@ -1673,7 +1673,7 @@ var publicModule;
             configurable: true
         });
         return publicClassWithWithPublicGetAccessorTypes;
-    })();
+    }());
     publicModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
     var privateClassWithWithPrivateGetAccessorTypes = (function () {
         function privateClassWithWithPrivateGetAccessorTypes() {
@@ -1735,7 +1735,7 @@ var publicModule;
             configurable: true
         });
         return privateClassWithWithPrivateGetAccessorTypes;
-    })();
+    }());
     var privateClassWithWithPublicGetAccessorTypes = (function () {
         function privateClassWithWithPublicGetAccessorTypes() {
         }
@@ -1796,7 +1796,7 @@ var publicModule;
             configurable: true
         });
         return privateClassWithWithPublicGetAccessorTypes;
-    })();
+    }());
     var publicClassWithWithPrivateSetAccessorTypes = (function () {
         function publicClassWithWithPrivateSetAccessorTypes() {
         }
@@ -1825,7 +1825,7 @@ var publicModule;
             configurable: true
         });
         return publicClassWithWithPrivateSetAccessorTypes;
-    })();
+    }());
     publicModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
     var publicClassWithWithPublicSetAccessorTypes = (function () {
         function publicClassWithWithPublicSetAccessorTypes() {
@@ -1855,7 +1855,7 @@ var publicModule;
             configurable: true
         });
         return publicClassWithWithPublicSetAccessorTypes;
-    })();
+    }());
     publicModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
     var privateClassWithWithPrivateSetAccessorTypes = (function () {
         function privateClassWithWithPrivateSetAccessorTypes() {
@@ -1885,7 +1885,7 @@ var publicModule;
             configurable: true
         });
         return privateClassWithWithPrivateSetAccessorTypes;
-    })();
+    }());
     var privateClassWithWithPublicSetAccessorTypes = (function () {
         function privateClassWithWithPublicSetAccessorTypes() {
         }
@@ -1914,7 +1914,7 @@ var publicModule;
             configurable: true
         });
         return privateClassWithWithPublicSetAccessorTypes;
-    })();
+    }());
     var publicClassWithPrivateModuleGetAccessorTypes = (function () {
         function publicClassWithPrivateModuleGetAccessorTypes() {
         }
@@ -1947,7 +1947,7 @@ var publicModule;
             configurable: true
         });
         return publicClassWithPrivateModuleGetAccessorTypes;
-    })();
+    }());
     publicModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
     var publicClassWithPrivateModuleSetAccessorTypes = (function () {
         function publicClassWithPrivateModuleSetAccessorTypes() {
@@ -1965,7 +1965,7 @@ var publicModule;
             configurable: true
         });
         return publicClassWithPrivateModuleSetAccessorTypes;
-    })();
+    }());
     publicModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
     var privateClassWithPrivateModuleGetAccessorTypes = (function () {
         function privateClassWithPrivateModuleGetAccessorTypes() {
@@ -1999,7 +1999,7 @@ var publicModule;
             configurable: true
         });
         return privateClassWithPrivateModuleGetAccessorTypes;
-    })();
+    }());
     var privateClassWithPrivateModuleSetAccessorTypes = (function () {
         function privateClassWithPrivateModuleSetAccessorTypes() {
         }
@@ -2016,7 +2016,7 @@ var publicModule;
             configurable: true
         });
         return privateClassWithPrivateModuleSetAccessorTypes;
-    })();
+    }());
 })(publicModule = exports.publicModule || (exports.publicModule = {}));
 var privateModule;
 (function (privateModule) {
@@ -2024,12 +2024,12 @@ var privateModule;
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     privateModule.publicClass = publicClass;
     var publicClassWithWithPrivateGetAccessorTypes = (function () {
         function publicClassWithWithPrivateGetAccessorTypes() {
@@ -2091,7 +2091,7 @@ var privateModule;
             configurable: true
         });
         return publicClassWithWithPrivateGetAccessorTypes;
-    })();
+    }());
     privateModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
     var publicClassWithWithPublicGetAccessorTypes = (function () {
         function publicClassWithWithPublicGetAccessorTypes() {
@@ -2153,7 +2153,7 @@ var privateModule;
             configurable: true
         });
         return publicClassWithWithPublicGetAccessorTypes;
-    })();
+    }());
     privateModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
     var privateClassWithWithPrivateGetAccessorTypes = (function () {
         function privateClassWithWithPrivateGetAccessorTypes() {
@@ -2215,7 +2215,7 @@ var privateModule;
             configurable: true
         });
         return privateClassWithWithPrivateGetAccessorTypes;
-    })();
+    }());
     var privateClassWithWithPublicGetAccessorTypes = (function () {
         function privateClassWithWithPublicGetAccessorTypes() {
         }
@@ -2276,7 +2276,7 @@ var privateModule;
             configurable: true
         });
         return privateClassWithWithPublicGetAccessorTypes;
-    })();
+    }());
     var publicClassWithWithPrivateSetAccessorTypes = (function () {
         function publicClassWithWithPrivateSetAccessorTypes() {
         }
@@ -2305,7 +2305,7 @@ var privateModule;
             configurable: true
         });
         return publicClassWithWithPrivateSetAccessorTypes;
-    })();
+    }());
     privateModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
     var publicClassWithWithPublicSetAccessorTypes = (function () {
         function publicClassWithWithPublicSetAccessorTypes() {
@@ -2335,7 +2335,7 @@ var privateModule;
             configurable: true
         });
         return publicClassWithWithPublicSetAccessorTypes;
-    })();
+    }());
     privateModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
     var privateClassWithWithPrivateSetAccessorTypes = (function () {
         function privateClassWithWithPrivateSetAccessorTypes() {
@@ -2365,7 +2365,7 @@ var privateModule;
             configurable: true
         });
         return privateClassWithWithPrivateSetAccessorTypes;
-    })();
+    }());
     var privateClassWithWithPublicSetAccessorTypes = (function () {
         function privateClassWithWithPublicSetAccessorTypes() {
         }
@@ -2394,7 +2394,7 @@ var privateModule;
             configurable: true
         });
         return privateClassWithWithPublicSetAccessorTypes;
-    })();
+    }());
     var publicClassWithPrivateModuleGetAccessorTypes = (function () {
         function publicClassWithPrivateModuleGetAccessorTypes() {
         }
@@ -2427,7 +2427,7 @@ var privateModule;
             configurable: true
         });
         return publicClassWithPrivateModuleGetAccessorTypes;
-    })();
+    }());
     privateModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
     var publicClassWithPrivateModuleSetAccessorTypes = (function () {
         function publicClassWithPrivateModuleSetAccessorTypes() {
@@ -2445,7 +2445,7 @@ var privateModule;
             configurable: true
         });
         return publicClassWithPrivateModuleSetAccessorTypes;
-    })();
+    }());
     privateModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
     var privateClassWithPrivateModuleGetAccessorTypes = (function () {
         function privateClassWithPrivateModuleGetAccessorTypes() {
@@ -2479,7 +2479,7 @@ var privateModule;
             configurable: true
         });
         return privateClassWithPrivateModuleGetAccessorTypes;
-    })();
+    }());
     var privateClassWithPrivateModuleSetAccessorTypes = (function () {
         function privateClassWithPrivateModuleSetAccessorTypes() {
         }
@@ -2496,14 +2496,14 @@ var privateModule;
             configurable: true
         });
         return privateClassWithPrivateModuleSetAccessorTypes;
-    })();
+    }());
 })(privateModule || (privateModule = {}));
 //// [privacyAccessorDeclFile_GlobalFile.js]
 var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
     }
     return publicClassInGlobal;
-})();
+}());
 var publicClassInGlobalWithPublicGetAccessorTypes = (function () {
     function publicClassInGlobalWithPublicGetAccessorTypes() {
     }
@@ -2564,7 +2564,7 @@ var publicClassInGlobalWithPublicGetAccessorTypes = (function () {
         configurable: true
     });
     return publicClassInGlobalWithPublicGetAccessorTypes;
-})();
+}());
 var publicClassInGlobalWithWithPublicSetAccessorTypes = (function () {
     function publicClassInGlobalWithWithPublicSetAccessorTypes() {
     }
@@ -2593,19 +2593,19 @@ var publicClassInGlobalWithWithPublicSetAccessorTypes = (function () {
         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) {
@@ -2613,12 +2613,12 @@ var publicModuleInGlobal;
             function privateClass() {
             }
             return privateClass;
-        })();
+        }());
         var publicClass = (function () {
             function publicClass() {
             }
             return publicClass;
-        })();
+        }());
         privateModule.publicClass = publicClass;
         var publicClassWithWithPrivateGetAccessorTypes = (function () {
             function publicClassWithWithPrivateGetAccessorTypes() {
@@ -2680,7 +2680,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return publicClassWithWithPrivateGetAccessorTypes;
-        })();
+        }());
         privateModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
         var publicClassWithWithPublicGetAccessorTypes = (function () {
             function publicClassWithWithPublicGetAccessorTypes() {
@@ -2742,7 +2742,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return publicClassWithWithPublicGetAccessorTypes;
-        })();
+        }());
         privateModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
         var privateClassWithWithPrivateGetAccessorTypes = (function () {
             function privateClassWithWithPrivateGetAccessorTypes() {
@@ -2804,7 +2804,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return privateClassWithWithPrivateGetAccessorTypes;
-        })();
+        }());
         var privateClassWithWithPublicGetAccessorTypes = (function () {
             function privateClassWithWithPublicGetAccessorTypes() {
             }
@@ -2865,7 +2865,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return privateClassWithWithPublicGetAccessorTypes;
-        })();
+        }());
         var publicClassWithWithPrivateSetAccessorTypes = (function () {
             function publicClassWithWithPrivateSetAccessorTypes() {
             }
@@ -2894,7 +2894,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return publicClassWithWithPrivateSetAccessorTypes;
-        })();
+        }());
         privateModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
         var publicClassWithWithPublicSetAccessorTypes = (function () {
             function publicClassWithWithPublicSetAccessorTypes() {
@@ -2924,7 +2924,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return publicClassWithWithPublicSetAccessorTypes;
-        })();
+        }());
         privateModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
         var privateClassWithWithPrivateSetAccessorTypes = (function () {
             function privateClassWithWithPrivateSetAccessorTypes() {
@@ -2954,7 +2954,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return privateClassWithWithPrivateSetAccessorTypes;
-        })();
+        }());
         var privateClassWithWithPublicSetAccessorTypes = (function () {
             function privateClassWithWithPublicSetAccessorTypes() {
             }
@@ -2983,7 +2983,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return privateClassWithWithPublicSetAccessorTypes;
-        })();
+        }());
         var publicClassWithPrivateModuleGetAccessorTypes = (function () {
             function publicClassWithPrivateModuleGetAccessorTypes() {
             }
@@ -3016,7 +3016,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return publicClassWithPrivateModuleGetAccessorTypes;
-        })();
+        }());
         privateModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
         var publicClassWithPrivateModuleSetAccessorTypes = (function () {
             function publicClassWithPrivateModuleSetAccessorTypes() {
@@ -3034,7 +3034,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return publicClassWithPrivateModuleSetAccessorTypes;
-        })();
+        }());
         privateModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
         var privateClassWithPrivateModuleGetAccessorTypes = (function () {
             function privateClassWithPrivateModuleGetAccessorTypes() {
@@ -3068,7 +3068,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return privateClassWithPrivateModuleGetAccessorTypes;
-        })();
+        }());
         var privateClassWithPrivateModuleSetAccessorTypes = (function () {
             function privateClassWithPrivateModuleSetAccessorTypes() {
             }
@@ -3085,7 +3085,7 @@ var publicModuleInGlobal;
                 configurable: true
             });
             return privateClassWithPrivateModuleSetAccessorTypes;
-        })();
+        }());
     })(privateModule || (privateModule = {}));
     var publicClassWithWithPrivateGetAccessorTypes = (function () {
         function publicClassWithWithPrivateGetAccessorTypes() {
@@ -3147,7 +3147,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return publicClassWithWithPrivateGetAccessorTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
     var publicClassWithWithPublicGetAccessorTypes = (function () {
         function publicClassWithWithPublicGetAccessorTypes() {
@@ -3209,7 +3209,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return publicClassWithWithPublicGetAccessorTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
     var privateClassWithWithPrivateGetAccessorTypes = (function () {
         function privateClassWithWithPrivateGetAccessorTypes() {
@@ -3271,7 +3271,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return privateClassWithWithPrivateGetAccessorTypes;
-    })();
+    }());
     var privateClassWithWithPublicGetAccessorTypes = (function () {
         function privateClassWithWithPublicGetAccessorTypes() {
         }
@@ -3332,7 +3332,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return privateClassWithWithPublicGetAccessorTypes;
-    })();
+    }());
     var publicClassWithWithPrivateSetAccessorTypes = (function () {
         function publicClassWithWithPrivateSetAccessorTypes() {
         }
@@ -3361,7 +3361,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return publicClassWithWithPrivateSetAccessorTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
     var publicClassWithWithPublicSetAccessorTypes = (function () {
         function publicClassWithWithPublicSetAccessorTypes() {
@@ -3391,7 +3391,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return publicClassWithWithPublicSetAccessorTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
     var privateClassWithWithPrivateSetAccessorTypes = (function () {
         function privateClassWithWithPrivateSetAccessorTypes() {
@@ -3421,7 +3421,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return privateClassWithWithPrivateSetAccessorTypes;
-    })();
+    }());
     var privateClassWithWithPublicSetAccessorTypes = (function () {
         function privateClassWithWithPublicSetAccessorTypes() {
         }
@@ -3450,7 +3450,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return privateClassWithWithPublicSetAccessorTypes;
-    })();
+    }());
     var publicClassWithPrivateModuleGetAccessorTypes = (function () {
         function publicClassWithPrivateModuleGetAccessorTypes() {
         }
@@ -3483,7 +3483,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return publicClassWithPrivateModuleGetAccessorTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
     var publicClassWithPrivateModuleSetAccessorTypes = (function () {
         function publicClassWithPrivateModuleSetAccessorTypes() {
@@ -3501,7 +3501,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return publicClassWithPrivateModuleSetAccessorTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
     var privateClassWithPrivateModuleGetAccessorTypes = (function () {
         function privateClassWithPrivateModuleGetAccessorTypes() {
@@ -3535,7 +3535,7 @@ var publicModuleInGlobal;
             configurable: true
         });
         return privateClassWithPrivateModuleGetAccessorTypes;
-    })();
+    }());
     var privateClassWithPrivateModuleSetAccessorTypes = (function () {
         function privateClassWithPrivateModuleSetAccessorTypes() {
         }
@@ -3552,5 +3552,5 @@ var publicModuleInGlobal;
             configurable: true
         });
         return privateClassWithPrivateModuleSetAccessorTypes;
-    })();
+    }());
 })(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
index cb6bbc38a7e07..4121dbdd51d1f 100644
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
@@ -144,7 +144,7 @@ var Widget1 = (function () {
         this.name = 'one';
     }
     return Widget1;
-})();
+}());
 exports.Widget1 = Widget1;
 function createWidget1() {
     return new Widget1();
@@ -157,7 +157,7 @@ var SpecializedWidget;
             this.name = 'one';
         }
         return Widget2;
-    })();
+    }());
     SpecializedWidget.Widget2 = Widget2;
     function createWidget2() {
         return new Widget2();
@@ -248,7 +248,7 @@ var publicClassWithWithPrivateGetAccessorTypes = (function () {
         configurable: true
     });
     return publicClassWithWithPrivateGetAccessorTypes;
-})();
+}());
 exports.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
 var privateClassWithWithPrivateGetAccessorTypes = (function () {
     function privateClassWithWithPrivateGetAccessorTypes() {
@@ -310,7 +310,7 @@ var privateClassWithWithPrivateGetAccessorTypes = (function () {
         configurable: true
     });
     return privateClassWithWithPrivateGetAccessorTypes;
-})();
+}());
 var publicClassWithPrivateModuleGetAccessorTypes = (function () {
     function publicClassWithPrivateModuleGetAccessorTypes() {
     }
@@ -343,7 +343,7 @@ var publicClassWithPrivateModuleGetAccessorTypes = (function () {
         configurable: true
     });
     return publicClassWithPrivateModuleGetAccessorTypes;
-})();
+}());
 exports.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
 var privateClassWithPrivateModuleGetAccessorTypes = (function () {
     function privateClassWithPrivateModuleGetAccessorTypes() {
@@ -377,7 +377,7 @@ var privateClassWithPrivateModuleGetAccessorTypes = (function () {
         configurable: true
     });
     return privateClassWithPrivateModuleGetAccessorTypes;
-})();
+}());
 
 
 //// [privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts]
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
index b64e813f4ee0f..6c2dcf304cfb7 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
@@ -108,7 +108,7 @@ var Widget1 = (function () {
         this.name = 'one';
     }
     return Widget1;
-})();
+}());
 exports.Widget1 = Widget1;
 function createWidget1() {
     return new Widget1();
@@ -121,7 +121,7 @@ var SpecializedWidget;
             this.name = 'one';
         }
         return Widget2;
-    })();
+    }());
     SpecializedWidget.Widget2 = Widget2;
     function createWidget2() {
         return new Widget2();
@@ -164,7 +164,7 @@ var publicClassWithWithPrivatePropertyTypes = (function () {
     publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
     publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
     return publicClassWithWithPrivatePropertyTypes;
-})();
+}());
 exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
 var privateClassWithWithPrivatePropertyTypes = (function () {
     function privateClassWithWithPrivatePropertyTypes() {
@@ -178,7 +178,7 @@ var privateClassWithWithPrivatePropertyTypes = (function () {
     privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3();
     privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
     return privateClassWithWithPrivatePropertyTypes;
-})();
+}());
 exports.publicVarWithPrivatePropertyTypes = exporter.createExportedWidget1(); // Error
 var privateVarWithPrivatePropertyTypes = exporter.createExportedWidget1();
 exports.publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
@@ -191,7 +191,7 @@ var publicClassWithPrivateModulePropertyTypes = (function () {
     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
@@ -203,7 +203,7 @@ var privateClassWithPrivateModulePropertyTypes = (function () {
     privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2();
     privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4();
     return privateClassWithPrivateModulePropertyTypes;
-})();
+}());
 var privateVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2();
 var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
 
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
index 94933d322e690..ff241a726bf57 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
@@ -20,7 +20,7 @@ var Foo = (function () {
         this.a = a;
     }
     return Foo;
-})();
+}());
 module.exports = Foo;
 //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.js]
 "use strict";
diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
index 1788435755af3..7d4db36ee9943 100644
--- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
+++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
@@ -18,13 +18,13 @@ define(["require", "exports"], function (require, exports) {
             var child = new B(this);
         }
         return A;
-    })();
+    }());
     exports.A = A;
     var B = (function () {
         function B(parent) {
         }
         return B;
-    })();
+    }());
     exports.B = B;
 });
 
diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js
index 74a4234b47433..a149aa26f7529 100644
--- a/tests/baselines/reference/privacyClass.js
+++ b/tests/baselines/reference/privacyClass.js
@@ -142,34 +142,34 @@ var m1;
         m1_c_public.prototype.f1 = function () {
         };
         return m1_c_public;
-    })();
+    }());
     m1.m1_c_public = m1_c_public;
     var m1_c_private = (function () {
         function m1_c_private() {
         }
         return m1_c_private;
-    })();
+    }());
     var m1_C1_private = (function (_super) {
         __extends(m1_C1_private, _super);
         function m1_C1_private() {
             _super.apply(this, arguments);
         }
         return m1_C1_private;
-    })(m1_c_public);
+    }(m1_c_public));
     var m1_C2_private = (function (_super) {
         __extends(m1_C2_private, _super);
         function m1_C2_private() {
             _super.apply(this, arguments);
         }
         return m1_C2_private;
-    })(m1_c_private);
+    }(m1_c_private));
     var m1_C3_public = (function (_super) {
         __extends(m1_C3_public, _super);
         function m1_C3_public() {
             _super.apply(this, arguments);
         }
         return m1_C3_public;
-    })(m1_c_public);
+    }(m1_c_public));
     m1.m1_C3_public = m1_C3_public;
     var m1_C4_public = (function (_super) {
         __extends(m1_C4_public, _super);
@@ -177,29 +177,29 @@ var m1;
             _super.apply(this, arguments);
         }
         return m1_C4_public;
-    })(m1_c_private);
+    }(m1_c_private));
     m1.m1_C4_public = m1_C4_public;
     var m1_C5_private = (function () {
         function m1_C5_private() {
         }
         return m1_C5_private;
-    })();
+    }());
     var m1_C6_private = (function () {
         function m1_C6_private() {
         }
         return m1_C6_private;
-    })();
+    }());
     var m1_C7_public = (function () {
         function m1_C7_public() {
         }
         return m1_C7_public;
-    })();
+    }());
     m1.m1_C7_public = m1_C7_public;
     var m1_C8_public = (function () {
         function m1_C8_public() {
         }
         return m1_C8_public;
-    })();
+    }());
     m1.m1_C8_public = m1_C8_public;
     var m1_C9_private = (function (_super) {
         __extends(m1_C9_private, _super);
@@ -207,21 +207,21 @@ var m1;
             _super.apply(this, arguments);
         }
         return m1_C9_private;
-    })(m1_c_public);
+    }(m1_c_public));
     var m1_C10_private = (function (_super) {
         __extends(m1_C10_private, _super);
         function m1_C10_private() {
             _super.apply(this, arguments);
         }
         return m1_C10_private;
-    })(m1_c_private);
+    }(m1_c_private));
     var m1_C11_public = (function (_super) {
         __extends(m1_C11_public, _super);
         function m1_C11_public() {
             _super.apply(this, arguments);
         }
         return m1_C11_public;
-    })(m1_c_public);
+    }(m1_c_public));
     m1.m1_C11_public = m1_C11_public;
     var m1_C12_public = (function (_super) {
         __extends(m1_C12_public, _super);
@@ -229,7 +229,7 @@ var m1;
             _super.apply(this, arguments);
         }
         return m1_C12_public;
-    })(m1_c_private);
+    }(m1_c_private));
     m1.m1_C12_public = m1_C12_public;
 })(m1 = exports.m1 || (exports.m1 = {}));
 var m2;
@@ -240,34 +240,34 @@ var m2;
         m2_c_public.prototype.f1 = function () {
         };
         return m2_c_public;
-    })();
+    }());
     m2.m2_c_public = m2_c_public;
     var m2_c_private = (function () {
         function m2_c_private() {
         }
         return m2_c_private;
-    })();
+    }());
     var m2_C1_private = (function (_super) {
         __extends(m2_C1_private, _super);
         function m2_C1_private() {
             _super.apply(this, arguments);
         }
         return m2_C1_private;
-    })(m2_c_public);
+    }(m2_c_public));
     var m2_C2_private = (function (_super) {
         __extends(m2_C2_private, _super);
         function m2_C2_private() {
             _super.apply(this, arguments);
         }
         return m2_C2_private;
-    })(m2_c_private);
+    }(m2_c_private));
     var m2_C3_public = (function (_super) {
         __extends(m2_C3_public, _super);
         function m2_C3_public() {
             _super.apply(this, arguments);
         }
         return m2_C3_public;
-    })(m2_c_public);
+    }(m2_c_public));
     m2.m2_C3_public = m2_C3_public;
     var m2_C4_public = (function (_super) {
         __extends(m2_C4_public, _super);
@@ -275,29 +275,29 @@ var m2;
             _super.apply(this, arguments);
         }
         return m2_C4_public;
-    })(m2_c_private);
+    }(m2_c_private));
     m2.m2_C4_public = m2_C4_public;
     var m2_C5_private = (function () {
         function m2_C5_private() {
         }
         return m2_C5_private;
-    })();
+    }());
     var m2_C6_private = (function () {
         function m2_C6_private() {
         }
         return m2_C6_private;
-    })();
+    }());
     var m2_C7_public = (function () {
         function m2_C7_public() {
         }
         return m2_C7_public;
-    })();
+    }());
     m2.m2_C7_public = m2_C7_public;
     var m2_C8_public = (function () {
         function m2_C8_public() {
         }
         return m2_C8_public;
-    })();
+    }());
     m2.m2_C8_public = m2_C8_public;
     var m2_C9_private = (function (_super) {
         __extends(m2_C9_private, _super);
@@ -305,21 +305,21 @@ var m2;
             _super.apply(this, arguments);
         }
         return m2_C9_private;
-    })(m2_c_public);
+    }(m2_c_public));
     var m2_C10_private = (function (_super) {
         __extends(m2_C10_private, _super);
         function m2_C10_private() {
             _super.apply(this, arguments);
         }
         return m2_C10_private;
-    })(m2_c_private);
+    }(m2_c_private));
     var m2_C11_public = (function (_super) {
         __extends(m2_C11_public, _super);
         function m2_C11_public() {
             _super.apply(this, arguments);
         }
         return m2_C11_public;
-    })(m2_c_public);
+    }(m2_c_public));
     m2.m2_C11_public = m2_C11_public;
     var m2_C12_public = (function (_super) {
         __extends(m2_C12_public, _super);
@@ -327,7 +327,7 @@ var m2;
             _super.apply(this, arguments);
         }
         return m2_C12_public;
-    })(m2_c_private);
+    }(m2_c_private));
     m2.m2_C12_public = m2_C12_public;
 })(m2 || (m2 = {}));
 var glo_c_public = (function () {
@@ -336,34 +336,34 @@ var glo_c_public = (function () {
     glo_c_public.prototype.f1 = function () {
     };
     return glo_c_public;
-})();
+}());
 exports.glo_c_public = glo_c_public;
 var glo_c_private = (function () {
     function glo_c_private() {
     }
     return glo_c_private;
-})();
+}());
 var glo_C1_private = (function (_super) {
     __extends(glo_C1_private, _super);
     function glo_C1_private() {
         _super.apply(this, arguments);
     }
     return glo_C1_private;
-})(glo_c_public);
+}(glo_c_public));
 var glo_C2_private = (function (_super) {
     __extends(glo_C2_private, _super);
     function glo_C2_private() {
         _super.apply(this, arguments);
     }
     return glo_C2_private;
-})(glo_c_private);
+}(glo_c_private));
 var glo_C3_public = (function (_super) {
     __extends(glo_C3_public, _super);
     function glo_C3_public() {
         _super.apply(this, arguments);
     }
     return glo_C3_public;
-})(glo_c_public);
+}(glo_c_public));
 exports.glo_C3_public = glo_C3_public;
 var glo_C4_public = (function (_super) {
     __extends(glo_C4_public, _super);
@@ -371,29 +371,29 @@ var glo_C4_public = (function (_super) {
         _super.apply(this, arguments);
     }
     return glo_C4_public;
-})(glo_c_private);
+}(glo_c_private));
 exports.glo_C4_public = glo_C4_public;
 var glo_C5_private = (function () {
     function glo_C5_private() {
     }
     return glo_C5_private;
-})();
+}());
 var glo_C6_private = (function () {
     function glo_C6_private() {
     }
     return glo_C6_private;
-})();
+}());
 var glo_C7_public = (function () {
     function glo_C7_public() {
     }
     return glo_C7_public;
-})();
+}());
 exports.glo_C7_public = glo_C7_public;
 var glo_C8_public = (function () {
     function glo_C8_public() {
     }
     return glo_C8_public;
-})();
+}());
 exports.glo_C8_public = glo_C8_public;
 var glo_C9_private = (function (_super) {
     __extends(glo_C9_private, _super);
@@ -401,21 +401,21 @@ var glo_C9_private = (function (_super) {
         _super.apply(this, arguments);
     }
     return glo_C9_private;
-})(glo_c_public);
+}(glo_c_public));
 var glo_C10_private = (function (_super) {
     __extends(glo_C10_private, _super);
     function glo_C10_private() {
         _super.apply(this, arguments);
     }
     return glo_C10_private;
-})(glo_c_private);
+}(glo_c_private));
 var glo_C11_public = (function (_super) {
     __extends(glo_C11_public, _super);
     function glo_C11_public() {
         _super.apply(this, arguments);
     }
     return glo_C11_public;
-})(glo_c_public);
+}(glo_c_public));
 exports.glo_C11_public = glo_C11_public;
 var glo_C12_public = (function (_super) {
     __extends(glo_C12_public, _super);
@@ -423,5 +423,5 @@ var glo_C12_public = (function (_super) {
         _super.apply(this, arguments);
     }
     return glo_C12_public;
-})(glo_c_private);
+}(glo_c_private));
 exports.glo_C12_public = glo_C12_public;
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
index 4efc6e12b1655..e2bb58781dec0 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -112,34 +112,34 @@ var publicModule;
         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);
+    }(publicClassInPublicModule));
     var privateClassExtendingPrivateClassInModule = (function (_super) {
         __extends(privateClassExtendingPrivateClassInModule, _super);
         function privateClassExtendingPrivateClassInModule() {
             _super.apply(this, arguments);
         }
         return privateClassExtendingPrivateClassInModule;
-    })(privateClassInPublicModule);
+    }(privateClassInPublicModule));
     var publicClassExtendingPublicClassInModule = (function (_super) {
         __extends(publicClassExtendingPublicClassInModule, _super);
         function publicClassExtendingPublicClassInModule() {
             _super.apply(this, arguments);
         }
         return publicClassExtendingPublicClassInModule;
-    })(publicClassInPublicModule);
+    }(publicClassInPublicModule));
     publicModule.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule;
     var publicClassExtendingPrivateClassInModule = (function (_super) {
         __extends(publicClassExtendingPrivateClassInModule, _super);
@@ -147,7 +147,7 @@ var publicModule;
             _super.apply(this, arguments);
         }
         return publicClassExtendingPrivateClassInModule;
-    })(privateClassInPublicModule);
+    }(privateClassInPublicModule));
     publicModule.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule;
     var privateClassExtendingFromPrivateModuleClass = (function (_super) {
         __extends(privateClassExtendingFromPrivateModuleClass, _super);
@@ -155,14 +155,14 @@ var publicModule;
             _super.apply(this, arguments);
         }
         return privateClassExtendingFromPrivateModuleClass;
-    })(privateModule.publicClassInPrivateModule);
+    }(privateModule.publicClassInPrivateModule));
     var publicClassExtendingFromPrivateModuleClass = (function (_super) {
         __extends(publicClassExtendingFromPrivateModuleClass, _super);
         function publicClassExtendingFromPrivateModuleClass() {
             _super.apply(this, arguments);
         }
         return publicClassExtendingFromPrivateModuleClass;
-    })(privateModule.publicClassInPrivateModule);
+    }(privateModule.publicClassInPrivateModule));
     publicModule.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
 })(publicModule = exports.publicModule || (exports.publicModule = {}));
 var privateModule;
@@ -173,34 +173,34 @@ var privateModule;
         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);
+    }(publicClassInPrivateModule));
     var privateClassExtendingPrivateClassInModule = (function (_super) {
         __extends(privateClassExtendingPrivateClassInModule, _super);
         function privateClassExtendingPrivateClassInModule() {
             _super.apply(this, arguments);
         }
         return privateClassExtendingPrivateClassInModule;
-    })(privateClassInPrivateModule);
+    }(privateClassInPrivateModule));
     var publicClassExtendingPublicClassInModule = (function (_super) {
         __extends(publicClassExtendingPublicClassInModule, _super);
         function publicClassExtendingPublicClassInModule() {
             _super.apply(this, arguments);
         }
         return publicClassExtendingPublicClassInModule;
-    })(publicClassInPrivateModule);
+    }(publicClassInPrivateModule));
     privateModule.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule;
     var publicClassExtendingPrivateClassInModule = (function (_super) {
         __extends(publicClassExtendingPrivateClassInModule, _super);
@@ -208,7 +208,7 @@ var privateModule;
             _super.apply(this, arguments);
         }
         return publicClassExtendingPrivateClassInModule;
-    })(privateClassInPrivateModule);
+    }(privateClassInPrivateModule));
     privateModule.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule;
     var privateClassExtendingFromPrivateModuleClass = (function (_super) {
         __extends(privateClassExtendingFromPrivateModuleClass, _super);
@@ -216,14 +216,14 @@ var privateModule;
             _super.apply(this, arguments);
         }
         return privateClassExtendingFromPrivateModuleClass;
-    })(privateModule.publicClassInPrivateModule);
+    }(privateModule.publicClassInPrivateModule));
     var publicClassExtendingFromPrivateModuleClass = (function (_super) {
         __extends(publicClassExtendingFromPrivateModuleClass, _super);
         function publicClassExtendingFromPrivateModuleClass() {
             _super.apply(this, arguments);
         }
         return publicClassExtendingFromPrivateModuleClass;
-    })(privateModule.publicClassInPrivateModule);
+    }(privateModule.publicClassInPrivateModule));
     privateModule.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
 })(privateModule || (privateModule = {}));
 var publicClass = (function () {
@@ -232,34 +232,34 @@ var publicClass = (function () {
     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);
+}(publicClass));
 var privateClassExtendingPrivateClassInModule = (function (_super) {
     __extends(privateClassExtendingPrivateClassInModule, _super);
     function privateClassExtendingPrivateClassInModule() {
         _super.apply(this, arguments);
     }
     return privateClassExtendingPrivateClassInModule;
-})(privateClass);
+}(privateClass));
 var publicClassExtendingPublicClass = (function (_super) {
     __extends(publicClassExtendingPublicClass, _super);
     function publicClassExtendingPublicClass() {
         _super.apply(this, arguments);
     }
     return publicClassExtendingPublicClass;
-})(publicClass);
+}(publicClass));
 exports.publicClassExtendingPublicClass = publicClassExtendingPublicClass;
 var publicClassExtendingPrivateClass = (function (_super) {
     __extends(publicClassExtendingPrivateClass, _super);
@@ -267,7 +267,7 @@ var publicClassExtendingPrivateClass = (function (_super) {
         _super.apply(this, arguments);
     }
     return publicClassExtendingPrivateClass;
-})(privateClass);
+}(privateClass));
 exports.publicClassExtendingPrivateClass = publicClassExtendingPrivateClass;
 var privateClassExtendingFromPrivateModuleClass = (function (_super) {
     __extends(privateClassExtendingFromPrivateModuleClass, _super);
@@ -275,14 +275,14 @@ var privateClassExtendingFromPrivateModuleClass = (function (_super) {
         _super.apply(this, arguments);
     }
     return privateClassExtendingFromPrivateModuleClass;
-})(privateModule.publicClassInPrivateModule);
+}(privateModule.publicClassInPrivateModule));
 var publicClassExtendingFromPrivateModuleClass = (function (_super) {
     __extends(publicClassExtendingFromPrivateModuleClass, _super);
     function publicClassExtendingFromPrivateModuleClass() {
         _super.apply(this, arguments);
     }
     return publicClassExtendingFromPrivateModuleClass;
-})(privateModule.publicClassInPrivateModule);
+}(privateModule.publicClassInPrivateModule));
 exports.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
 //// [privacyClassExtendsClauseDeclFile_GlobalFile.js]
 var __extends = (this && this.__extends) || function (d, b) {
@@ -298,34 +298,34 @@ var publicModuleInGlobal;
         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);
+    }(publicClassInPublicModule));
     var privateClassExtendingPrivateClassInModule = (function (_super) {
         __extends(privateClassExtendingPrivateClassInModule, _super);
         function privateClassExtendingPrivateClassInModule() {
             _super.apply(this, arguments);
         }
         return privateClassExtendingPrivateClassInModule;
-    })(privateClassInPublicModule);
+    }(privateClassInPublicModule));
     var publicClassExtendingPublicClassInModule = (function (_super) {
         __extends(publicClassExtendingPublicClassInModule, _super);
         function publicClassExtendingPublicClassInModule() {
             _super.apply(this, arguments);
         }
         return publicClassExtendingPublicClassInModule;
-    })(publicClassInPublicModule);
+    }(publicClassInPublicModule));
     publicModuleInGlobal.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule;
     var publicClassExtendingPrivateClassInModule = (function (_super) {
         __extends(publicClassExtendingPrivateClassInModule, _super);
@@ -333,18 +333,18 @@ var publicModuleInGlobal;
             _super.apply(this, arguments);
         }
         return publicClassExtendingPrivateClassInModule;
-    })(privateClassInPublicModule);
+    }(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);
+}(publicClassInGlobal));
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
index 74f1ec1bec69b..15de9a1667460 100644
--- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
@@ -102,40 +102,40 @@ var publicModule;
         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;
 })(publicModule = exports.publicModule || (exports.publicModule = {}));
 var privateModule;
@@ -144,68 +144,68 @@ var privateModule;
         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;
@@ -214,27 +214,27 @@ var publicModuleInGlobal;
         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.js b/tests/baselines/reference/privacyFunc.js
index d822e49694669..b9c0e8e13c97b 100644
--- a/tests/baselines/reference/privacyFunc.js
+++ b/tests/baselines/reference/privacyFunc.js
@@ -237,13 +237,13 @@ var m1;
         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(m1_c3_c1_2) {
         }
@@ -280,7 +280,7 @@ var m1;
             return new C2_private(); //error
         };
         return C3_public;
-    })();
+    }());
     m1.C3_public = C3_public;
     var C4_private = (function () {
         function C4_private(m1_c4_c1_2) {
@@ -318,29 +318,29 @@ var m1;
             return new C2_private();
         };
         return C4_private;
-    })();
+    }());
     var C5_public = (function () {
         function C5_public(m1_c5_c) {
         }
         return C5_public;
-    })();
+    }());
     m1.C5_public = C5_public;
     var C6_private = (function () {
         function C6_private(m1_c6_c) {
         }
         return C6_private;
-    })();
+    }());
     var C7_public = (function () {
         function C7_public(m1_c7_c) {
         }
         return C7_public;
-    })();
+    }());
     m1.C7_public = C7_public;
     var C8_private = (function () {
         function C8_private(m1_c8_c) {
         }
         return C8_private;
-    })();
+    }());
     function f1_public(m1_f1_arg) {
     }
     function f2_public(m1_f2_arg) {
@@ -384,7 +384,7 @@ var C6_public = (function () {
     function C6_public() {
     }
     return C6_public;
-})();
+}());
 var C7_public = (function () {
     function C7_public(c7_c1_2) {
     }
@@ -405,12 +405,12 @@ var C7_public = (function () {
         return new C6_public();
     };
     return C7_public;
-})();
+}());
 var C9_public = (function () {
     function C9_public(c9_c) {
     }
     return C9_public;
-})();
+}());
 function f4_public(f4_arg) {
 }
 function f6_public() {
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
index 6f567ec3bd0ef..d8bfef7060e22 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
@@ -164,7 +164,7 @@ var Widget1 = (function () {
         this.name = 'one';
     }
     return Widget1;
-})();
+}());
 exports.Widget1 = Widget1;
 function createWidget1() {
     return new Widget1();
@@ -177,7 +177,7 @@ var SpecializedWidget;
             this.name = 'one';
         }
         return Widget2;
-    })();
+    }());
     SpecializedWidget.Widget2 = Widget2;
     function createWidget2() {
         return new Widget2();
@@ -229,7 +229,7 @@ var publicClassWithWithPrivateParmeterTypes = (function () {
         if (param === void 0) { param = exporter.createExportedWidget1(); }
     };
     return publicClassWithWithPrivateParmeterTypes;
-})();
+}());
 exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
 var publicClassWithWithPrivateParmeterTypes1 = (function () {
     function publicClassWithWithPrivateParmeterTypes1(param, param1, param2) {
@@ -252,7 +252,7 @@ var publicClassWithWithPrivateParmeterTypes1 = (function () {
         if (param === void 0) { param = exporter.createExportedWidget3(); }
     };
     return publicClassWithWithPrivateParmeterTypes1;
-})();
+}());
 exports.publicClassWithWithPrivateParmeterTypes1 = publicClassWithWithPrivateParmeterTypes1;
 var privateClassWithWithPrivateParmeterTypes = (function () {
     function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
@@ -275,7 +275,7 @@ var privateClassWithWithPrivateParmeterTypes = (function () {
         if (param === void 0) { param = exporter.createExportedWidget1(); }
     };
     return privateClassWithWithPrivateParmeterTypes;
-})();
+}());
 var privateClassWithWithPrivateParmeterTypes2 = (function () {
     function privateClassWithWithPrivateParmeterTypes2(param, param1, param2) {
         if (param === void 0) { param = exporter.createExportedWidget3(); }
@@ -297,7 +297,7 @@ var privateClassWithWithPrivateParmeterTypes2 = (function () {
         if (param === void 0) { param = exporter.createExportedWidget3(); }
     };
     return privateClassWithWithPrivateParmeterTypes2;
-})();
+}());
 function publicFunctionWithPrivateParmeterTypes(param) {
     if (param === void 0) { param = exporter.createExportedWidget1(); }
 }
@@ -327,7 +327,7 @@ var publicClassWithPrivateModuleParameterTypes = (function () {
         if (param === void 0) { param = exporter.createExportedWidget2(); }
     };
     return publicClassWithPrivateModuleParameterTypes;
-})();
+}());
 exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
 var publicClassWithPrivateModuleParameterTypes2 = (function () {
     function publicClassWithPrivateModuleParameterTypes2(param, param1, param2) {
@@ -344,7 +344,7 @@ var publicClassWithPrivateModuleParameterTypes2 = (function () {
         if (param === void 0) { param = exporter.createExportedWidget4(); }
     };
     return publicClassWithPrivateModuleParameterTypes2;
-})();
+}());
 exports.publicClassWithPrivateModuleParameterTypes2 = publicClassWithPrivateModuleParameterTypes2;
 function publicFunctionWithPrivateModuleParameterTypes(param) {
     if (param === void 0) { param = exporter.createExportedWidget2(); }
@@ -369,7 +369,7 @@ var privateClassWithPrivateModuleParameterTypes = (function () {
         if (param === void 0) { param = exporter.createExportedWidget2(); }
     };
     return privateClassWithPrivateModuleParameterTypes;
-})();
+}());
 var privateClassWithPrivateModuleParameterTypes1 = (function () {
     function privateClassWithPrivateModuleParameterTypes1(param, param1, param2) {
         if (param === void 0) { param = exporter.createExportedWidget4(); }
@@ -385,7 +385,7 @@ var privateClassWithPrivateModuleParameterTypes1 = (function () {
         if (param === void 0) { param = exporter.createExportedWidget4(); }
     };
     return privateClassWithPrivateModuleParameterTypes1;
-})();
+}());
 function privateFunctionWithPrivateModuleParameterTypes(param) {
     if (param === void 0) { param = exporter.createExportedWidget2(); }
 }
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
index 1de0f2b664276..3b1ffb487ffa9 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
@@ -171,7 +171,7 @@ var Widget1 = (function () {
         this.name = 'one';
     }
     return Widget1;
-})();
+}());
 exports.Widget1 = Widget1;
 function createWidget1() {
     return new Widget1();
@@ -184,7 +184,7 @@ var SpecializedWidget;
             this.name = 'one';
         }
         return Widget2;
-    })();
+    }());
     SpecializedWidget.Widget2 = Widget2;
     function createWidget2() {
         return new Widget2();
@@ -249,7 +249,7 @@ var publicClassWithWithPrivateParmeterTypes = (function () {
         ;
     };
     return publicClassWithWithPrivateParmeterTypes;
-})();
+}());
 exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
 var privateClassWithWithPrivateParmeterTypes = (function () {
     function privateClassWithWithPrivateParmeterTypes() {
@@ -285,7 +285,7 @@ var privateClassWithWithPrivateParmeterTypes = (function () {
         ;
     };
     return privateClassWithWithPrivateParmeterTypes;
-})();
+}());
 function publicFunctionWithPrivateParmeterTypes() {
     return exporter.createExportedWidget1();
 }
@@ -316,7 +316,7 @@ var publicClassWithPrivateModuleReturnTypes = (function () {
         return exporter.createExportedWidget4();
     };
     return publicClassWithPrivateModuleReturnTypes;
-})();
+}());
 exports.publicClassWithPrivateModuleReturnTypes = publicClassWithPrivateModuleReturnTypes;
 function publicFunctionWithPrivateModuleReturnTypes() {
     return exporter.createExportedWidget2();
@@ -342,7 +342,7 @@ var privateClassWithPrivateModuleReturnTypes = (function () {
         return exporter.createExportedWidget4();
     };
     return privateClassWithPrivateModuleReturnTypes;
-})();
+}());
 function privateFunctionWithPrivateModuleReturnTypes() {
     return exporter.createExportedWidget2();
 }
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
index e02c221d33395..e8fff791a0e4d 100644
--- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
@@ -692,12 +692,12 @@ 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) {
@@ -713,7 +713,7 @@ var publicClassWithWithPrivateParmeterTypes = (function () {
     publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
     };
     return publicClassWithWithPrivateParmeterTypes;
-})();
+}());
 exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
 var publicClassWithWithPublicParmeterTypes = (function () {
     function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
@@ -729,7 +729,7 @@ var publicClassWithWithPublicParmeterTypes = (function () {
     publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
     };
     return publicClassWithWithPublicParmeterTypes;
-})();
+}());
 exports.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
 var privateClassWithWithPrivateParmeterTypes = (function () {
     function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
@@ -745,7 +745,7 @@ var privateClassWithWithPrivateParmeterTypes = (function () {
     privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
     };
     return privateClassWithWithPrivateParmeterTypes;
-})();
+}());
 var privateClassWithWithPublicParmeterTypes = (function () {
     function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
         this.param1 = param1;
@@ -760,7 +760,7 @@ var privateClassWithWithPublicParmeterTypes = (function () {
     privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
     };
     return privateClassWithWithPublicParmeterTypes;
-})();
+}());
 function publicFunctionWithPrivateParmeterTypes(param) {
 }
 exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
@@ -781,7 +781,7 @@ var publicClassWithPrivateModuleParameterTypes = (function () {
     publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
     };
     return publicClassWithPrivateModuleParameterTypes;
-})();
+}());
 exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
 function publicFunctionWithPrivateModuleParameterTypes(param) {
 }
@@ -796,7 +796,7 @@ var privateClassWithPrivateModuleParameterTypes = (function () {
     privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
     };
     return privateClassWithPrivateModuleParameterTypes;
-})();
+}());
 function privateFunctionWithPrivateModuleParameterTypes(param) {
 }
 var publicModule;
@@ -805,12 +805,12 @@ var publicModule;
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     publicModule.publicClass = publicClass;
     var publicClassWithWithPrivateParmeterTypes = (function () {
         function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
@@ -826,7 +826,7 @@ var publicModule;
         publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return publicClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     publicModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
     var publicClassWithWithPublicParmeterTypes = (function () {
         function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
@@ -842,7 +842,7 @@ var publicModule;
         publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return publicClassWithWithPublicParmeterTypes;
-    })();
+    }());
     publicModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
     var privateClassWithWithPrivateParmeterTypes = (function () {
         function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
@@ -858,7 +858,7 @@ var publicModule;
         privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return privateClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     var privateClassWithWithPublicParmeterTypes = (function () {
         function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
             this.param1 = param1;
@@ -873,7 +873,7 @@ var publicModule;
         privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return privateClassWithWithPublicParmeterTypes;
-    })();
+    }());
     function publicFunctionWithPrivateParmeterTypes(param) {
     }
     publicModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
@@ -894,7 +894,7 @@ var publicModule;
         publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
         };
         return publicClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     publicModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
     function publicFunctionWithPrivateModuleParameterTypes(param) {
     }
@@ -909,7 +909,7 @@ var publicModule;
         privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
         };
         return privateClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     function privateFunctionWithPrivateModuleParameterTypes(param) {
     }
 })(publicModule = exports.publicModule || (exports.publicModule = {}));
@@ -919,12 +919,12 @@ var privateModule;
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     privateModule.publicClass = publicClass;
     var publicClassWithWithPrivateParmeterTypes = (function () {
         function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
@@ -940,7 +940,7 @@ var privateModule;
         publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return publicClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
     var publicClassWithWithPublicParmeterTypes = (function () {
         function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
@@ -956,7 +956,7 @@ var privateModule;
         publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return publicClassWithWithPublicParmeterTypes;
-    })();
+    }());
     privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
     var privateClassWithWithPrivateParmeterTypes = (function () {
         function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
@@ -972,7 +972,7 @@ var privateModule;
         privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return privateClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     var privateClassWithWithPublicParmeterTypes = (function () {
         function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
             this.param1 = param1;
@@ -987,7 +987,7 @@ var privateModule;
         privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return privateClassWithWithPublicParmeterTypes;
-    })();
+    }());
     function publicFunctionWithPrivateParmeterTypes(param) {
     }
     privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
@@ -1008,7 +1008,7 @@ var privateModule;
         publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
         };
         return publicClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
     function publicFunctionWithPrivateModuleParameterTypes(param) {
     }
@@ -1023,7 +1023,7 @@ var privateModule;
         privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
         };
         return privateClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     function privateFunctionWithPrivateModuleParameterTypes(param) {
     }
 })(privateModule || (privateModule = {}));
@@ -1032,7 +1032,7 @@ var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
     }
     return publicClassInGlobal;
-})();
+}());
 var publicClassWithWithPublicParmeterTypesInGlobal = (function () {
     function publicClassWithWithPublicParmeterTypesInGlobal(param, param1, param2) {
         this.param1 = param1;
@@ -1047,7 +1047,7 @@ var publicClassWithWithPublicParmeterTypesInGlobal = (function () {
     publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod = function (param) {
     };
     return publicClassWithWithPublicParmeterTypesInGlobal;
-})();
+}());
 function publicFunctionWithPublicParmeterTypesInGlobal(param) {
 }
 var publicModuleInGlobal;
@@ -1056,12 +1056,12 @@ var publicModuleInGlobal;
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     publicModuleInGlobal.publicClass = publicClass;
     var privateModule;
     (function (privateModule) {
@@ -1069,12 +1069,12 @@ var publicModuleInGlobal;
             function privateClass() {
             }
             return privateClass;
-        })();
+        }());
         var publicClass = (function () {
             function publicClass() {
             }
             return publicClass;
-        })();
+        }());
         privateModule.publicClass = publicClass;
         var publicClassWithWithPrivateParmeterTypes = (function () {
             function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
@@ -1090,7 +1090,7 @@ var publicModuleInGlobal;
             publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
             };
             return publicClassWithWithPrivateParmeterTypes;
-        })();
+        }());
         privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
         var publicClassWithWithPublicParmeterTypes = (function () {
             function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
@@ -1106,7 +1106,7 @@ var publicModuleInGlobal;
             publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
             };
             return publicClassWithWithPublicParmeterTypes;
-        })();
+        }());
         privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
         var privateClassWithWithPrivateParmeterTypes = (function () {
             function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
@@ -1122,7 +1122,7 @@ var publicModuleInGlobal;
             privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
             };
             return privateClassWithWithPrivateParmeterTypes;
-        })();
+        }());
         var privateClassWithWithPublicParmeterTypes = (function () {
             function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
                 this.param1 = param1;
@@ -1137,7 +1137,7 @@ var publicModuleInGlobal;
             privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
             };
             return privateClassWithWithPublicParmeterTypes;
-        })();
+        }());
         function publicFunctionWithPrivateParmeterTypes(param) {
         }
         privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
@@ -1158,7 +1158,7 @@ var publicModuleInGlobal;
             publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
             };
             return publicClassWithPrivateModuleParameterTypes;
-        })();
+        }());
         privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
         function publicFunctionWithPrivateModuleParameterTypes(param) {
         }
@@ -1173,7 +1173,7 @@ var publicModuleInGlobal;
             privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
             };
             return privateClassWithPrivateModuleParameterTypes;
-        })();
+        }());
         function privateFunctionWithPrivateModuleParameterTypes(param) {
         }
     })(privateModule || (privateModule = {}));
@@ -1191,7 +1191,7 @@ var publicModuleInGlobal;
         publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return publicClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
     var publicClassWithWithPublicParmeterTypes = (function () {
         function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
@@ -1207,7 +1207,7 @@ var publicModuleInGlobal;
         publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return publicClassWithWithPublicParmeterTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
     var privateClassWithWithPrivateParmeterTypes = (function () {
         function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
@@ -1223,7 +1223,7 @@ var publicModuleInGlobal;
         privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return privateClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     var privateClassWithWithPublicParmeterTypes = (function () {
         function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
             this.param1 = param1;
@@ -1238,7 +1238,7 @@ var publicModuleInGlobal;
         privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
         };
         return privateClassWithWithPublicParmeterTypes;
-    })();
+    }());
     function publicFunctionWithPrivateParmeterTypes(param) {
     }
     publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
@@ -1259,7 +1259,7 @@ var publicModuleInGlobal;
         publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
         };
         return publicClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
     function publicFunctionWithPrivateModuleParameterTypes(param) {
     }
@@ -1274,7 +1274,7 @@ var publicModuleInGlobal;
         privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
         };
         return privateClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     function privateFunctionWithPrivateModuleParameterTypes(param) {
     }
 })(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
index b312578b7a390..d4265b1c3524e 100644
--- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
+++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
@@ -1199,12 +1199,12 @@ var privateClass = (function () {
     function privateClass() {
     }
     return privateClass;
-})();
+}());
 var publicClass = (function () {
     function publicClass() {
     }
     return publicClass;
-})();
+}());
 exports.publicClass = publicClass;
 var publicClassWithWithPrivateParmeterTypes = (function () {
     function publicClassWithWithPrivateParmeterTypes() {
@@ -1234,7 +1234,7 @@ var publicClassWithWithPrivateParmeterTypes = (function () {
         return new privateClass();
     };
     return publicClassWithWithPrivateParmeterTypes;
-})();
+}());
 exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
 var publicClassWithWithPublicParmeterTypes = (function () {
     function publicClassWithWithPublicParmeterTypes() {
@@ -1264,7 +1264,7 @@ var publicClassWithWithPublicParmeterTypes = (function () {
         return new publicClass();
     };
     return publicClassWithWithPublicParmeterTypes;
-})();
+}());
 exports.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
 var privateClassWithWithPrivateParmeterTypes = (function () {
     function privateClassWithWithPrivateParmeterTypes() {
@@ -1294,7 +1294,7 @@ var privateClassWithWithPrivateParmeterTypes = (function () {
         return new privateClass();
     };
     return privateClassWithWithPrivateParmeterTypes;
-})();
+}());
 var privateClassWithWithPublicParmeterTypes = (function () {
     function privateClassWithWithPublicParmeterTypes() {
     }
@@ -1323,7 +1323,7 @@ var privateClassWithWithPublicParmeterTypes = (function () {
         return new publicClass();
     };
     return privateClassWithWithPublicParmeterTypes;
-})();
+}());
 function publicFunctionWithPrivateParmeterTypes() {
     return null;
 }
@@ -1368,7 +1368,7 @@ var publicClassWithPrivateModuleParameterTypes = (function () {
         return new privateModule.publicClass();
     };
     return publicClassWithPrivateModuleParameterTypes;
-})();
+}());
 exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
 function publicFunctionWithPrivateModuleParameterTypes() {
     return null;
@@ -1394,7 +1394,7 @@ var privateClassWithPrivateModuleParameterTypes = (function () {
         return new privateModule.publicClass();
     };
     return privateClassWithPrivateModuleParameterTypes;
-})();
+}());
 function privateFunctionWithPrivateModuleParameterTypes() {
     return null;
 }
@@ -1407,12 +1407,12 @@ var publicModule;
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     publicModule.publicClass = publicClass;
     var publicClassWithWithPrivateParmeterTypes = (function () {
         function publicClassWithWithPrivateParmeterTypes() {
@@ -1442,7 +1442,7 @@ var publicModule;
             return new privateClass();
         };
         return publicClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     publicModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
     var publicClassWithWithPublicParmeterTypes = (function () {
         function publicClassWithWithPublicParmeterTypes() {
@@ -1472,7 +1472,7 @@ var publicModule;
             return new publicClass();
         };
         return publicClassWithWithPublicParmeterTypes;
-    })();
+    }());
     publicModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
     var privateClassWithWithPrivateParmeterTypes = (function () {
         function privateClassWithWithPrivateParmeterTypes() {
@@ -1502,7 +1502,7 @@ var publicModule;
             return new privateClass();
         };
         return privateClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     var privateClassWithWithPublicParmeterTypes = (function () {
         function privateClassWithWithPublicParmeterTypes() {
         }
@@ -1531,7 +1531,7 @@ var publicModule;
             return new publicClass();
         };
         return privateClassWithWithPublicParmeterTypes;
-    })();
+    }());
     function publicFunctionWithPrivateParmeterTypes() {
         return null;
     }
@@ -1576,7 +1576,7 @@ var publicModule;
             return new privateModule.publicClass();
         };
         return publicClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     publicModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
     function publicFunctionWithPrivateModuleParameterTypes() {
         return null;
@@ -1602,7 +1602,7 @@ var publicModule;
             return new privateModule.publicClass();
         };
         return privateClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     function privateFunctionWithPrivateModuleParameterTypes() {
         return null;
     }
@@ -1616,12 +1616,12 @@ var privateModule;
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     privateModule.publicClass = publicClass;
     var publicClassWithWithPrivateParmeterTypes = (function () {
         function publicClassWithWithPrivateParmeterTypes() {
@@ -1651,7 +1651,7 @@ var privateModule;
             return new privateClass();
         };
         return publicClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
     var publicClassWithWithPublicParmeterTypes = (function () {
         function publicClassWithWithPublicParmeterTypes() {
@@ -1681,7 +1681,7 @@ var privateModule;
             return new publicClass();
         };
         return publicClassWithWithPublicParmeterTypes;
-    })();
+    }());
     privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
     var privateClassWithWithPrivateParmeterTypes = (function () {
         function privateClassWithWithPrivateParmeterTypes() {
@@ -1711,7 +1711,7 @@ var privateModule;
             return new privateClass();
         };
         return privateClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     var privateClassWithWithPublicParmeterTypes = (function () {
         function privateClassWithWithPublicParmeterTypes() {
         }
@@ -1740,7 +1740,7 @@ var privateModule;
             return new publicClass();
         };
         return privateClassWithWithPublicParmeterTypes;
-    })();
+    }());
     function publicFunctionWithPrivateParmeterTypes() {
         return null;
     }
@@ -1785,7 +1785,7 @@ var privateModule;
             return new privateModule.publicClass();
         };
         return publicClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
     function publicFunctionWithPrivateModuleParameterTypes() {
         return null;
@@ -1811,7 +1811,7 @@ var privateModule;
             return new privateModule.publicClass();
         };
         return privateClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     function privateFunctionWithPrivateModuleParameterTypes() {
         return null;
     }
@@ -1824,7 +1824,7 @@ var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
     }
     return publicClassInGlobal;
-})();
+}());
 var publicClassWithWithPublicParmeterTypesInGlobal = (function () {
     function publicClassWithWithPublicParmeterTypesInGlobal() {
     }
@@ -1853,7 +1853,7 @@ var publicClassWithWithPublicParmeterTypesInGlobal = (function () {
         return new publicClassInGlobal();
     };
     return publicClassWithWithPublicParmeterTypesInGlobal;
-})();
+}());
 function publicFunctionWithPublicParmeterTypesInGlobal() {
     return null;
 }
@@ -1866,12 +1866,12 @@ var publicModuleInGlobal;
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     publicModuleInGlobal.publicClass = publicClass;
     var privateModule;
     (function (privateModule) {
@@ -1879,12 +1879,12 @@ var publicModuleInGlobal;
             function privateClass() {
             }
             return privateClass;
-        })();
+        }());
         var publicClass = (function () {
             function publicClass() {
             }
             return publicClass;
-        })();
+        }());
         privateModule.publicClass = publicClass;
         var publicClassWithWithPrivateParmeterTypes = (function () {
             function publicClassWithWithPrivateParmeterTypes() {
@@ -1914,7 +1914,7 @@ var publicModuleInGlobal;
                 return new privateClass();
             };
             return publicClassWithWithPrivateParmeterTypes;
-        })();
+        }());
         privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
         var publicClassWithWithPublicParmeterTypes = (function () {
             function publicClassWithWithPublicParmeterTypes() {
@@ -1944,7 +1944,7 @@ var publicModuleInGlobal;
                 return new publicClass();
             };
             return publicClassWithWithPublicParmeterTypes;
-        })();
+        }());
         privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
         var privateClassWithWithPrivateParmeterTypes = (function () {
             function privateClassWithWithPrivateParmeterTypes() {
@@ -1974,7 +1974,7 @@ var publicModuleInGlobal;
                 return new privateClass();
             };
             return privateClassWithWithPrivateParmeterTypes;
-        })();
+        }());
         var privateClassWithWithPublicParmeterTypes = (function () {
             function privateClassWithWithPublicParmeterTypes() {
             }
@@ -2003,7 +2003,7 @@ var publicModuleInGlobal;
                 return new publicClass();
             };
             return privateClassWithWithPublicParmeterTypes;
-        })();
+        }());
         function publicFunctionWithPrivateParmeterTypes() {
             return null;
         }
@@ -2048,7 +2048,7 @@ var publicModuleInGlobal;
                 return new privateModule.publicClass();
             };
             return publicClassWithPrivateModuleParameterTypes;
-        })();
+        }());
         privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
         function publicFunctionWithPrivateModuleParameterTypes() {
             return null;
@@ -2074,7 +2074,7 @@ var publicModuleInGlobal;
                 return new privateModule.publicClass();
             };
             return privateClassWithPrivateModuleParameterTypes;
-        })();
+        }());
         function privateFunctionWithPrivateModuleParameterTypes() {
             return null;
         }
@@ -2110,7 +2110,7 @@ var publicModuleInGlobal;
             return new privateClass();
         };
         return publicClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
     var publicClassWithWithPublicParmeterTypes = (function () {
         function publicClassWithWithPublicParmeterTypes() {
@@ -2140,7 +2140,7 @@ var publicModuleInGlobal;
             return new publicClass();
         };
         return publicClassWithWithPublicParmeterTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
     var privateClassWithWithPrivateParmeterTypes = (function () {
         function privateClassWithWithPrivateParmeterTypes() {
@@ -2170,7 +2170,7 @@ var publicModuleInGlobal;
             return new privateClass();
         };
         return privateClassWithWithPrivateParmeterTypes;
-    })();
+    }());
     var privateClassWithWithPublicParmeterTypes = (function () {
         function privateClassWithWithPublicParmeterTypes() {
         }
@@ -2199,7 +2199,7 @@ var publicModuleInGlobal;
             return new publicClass();
         };
         return privateClassWithWithPublicParmeterTypes;
-    })();
+    }());
     function publicFunctionWithPrivateParmeterTypes() {
         return null;
     }
@@ -2244,7 +2244,7 @@ var publicModuleInGlobal;
             return new privateModule.publicClass();
         };
         return publicClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
     function publicFunctionWithPrivateModuleParameterTypes() {
         return null;
@@ -2270,7 +2270,7 @@ var publicModuleInGlobal;
             return new privateModule.publicClass();
         };
         return privateClassWithPrivateModuleParameterTypes;
-    })();
+    }());
     function privateFunctionWithPrivateModuleParameterTypes() {
         return null;
     }
diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js
index 95e3dda5643e7..37d89442e628c 100644
--- a/tests/baselines/reference/privacyGetter.js
+++ b/tests/baselines/reference/privacyGetter.js
@@ -218,13 +218,13 @@ define(["require", "exports"], function (require, exports) {
             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() {
             }
@@ -265,7 +265,7 @@ define(["require", "exports"], function (require, exports) {
                 configurable: true
             });
             return C3_public;
-        })();
+        }());
         m1.C3_public = C3_public;
         var C4_private = (function () {
             function C4_private() {
@@ -307,7 +307,7 @@ define(["require", "exports"], function (require, exports) {
                 configurable: true
             });
             return C4_private;
-        })();
+        }());
     })(m1 = exports.m1 || (exports.m1 = {}));
     var m2;
     (function (m2) {
@@ -317,13 +317,13 @@ define(["require", "exports"], function (require, exports) {
             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() {
             }
@@ -364,7 +364,7 @@ define(["require", "exports"], function (require, exports) {
                 configurable: true
             });
             return m2_C3_public;
-        })();
+        }());
         m2.m2_C3_public = m2_C3_public;
         var m2_C4_private = (function () {
             function m2_C4_private() {
@@ -406,7 +406,7 @@ define(["require", "exports"], function (require, exports) {
                 configurable: true
             });
             return m2_C4_private;
-        })();
+        }());
     })(m2 || (m2 = {}));
     var C5_private = (function () {
         function C5_private() {
@@ -414,12 +414,12 @@ define(["require", "exports"], function (require, exports) {
         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() {
@@ -461,7 +461,7 @@ define(["require", "exports"], function (require, exports) {
             configurable: true
         });
         return C7_public;
-    })();
+    }());
     exports.C7_public = C7_public;
     var C8_private = (function () {
         function C8_private() {
@@ -503,5 +503,5 @@ define(["require", "exports"], function (require, exports) {
             configurable: true
         });
         return C8_private;
-    })();
+    }());
 });
diff --git a/tests/baselines/reference/privacyGloClass.js b/tests/baselines/reference/privacyGloClass.js
index 01eff3127398c..e8c8c447cf9f9 100644
--- a/tests/baselines/reference/privacyGloClass.js
+++ b/tests/baselines/reference/privacyGloClass.js
@@ -74,34 +74,34 @@ var m1;
         m1_c_public.prototype.f1 = function () {
         };
         return m1_c_public;
-    })();
+    }());
     m1.m1_c_public = m1_c_public;
     var m1_c_private = (function () {
         function m1_c_private() {
         }
         return m1_c_private;
-    })();
+    }());
     var m1_C1_private = (function (_super) {
         __extends(m1_C1_private, _super);
         function m1_C1_private() {
             _super.apply(this, arguments);
         }
         return m1_C1_private;
-    })(m1_c_public);
+    }(m1_c_public));
     var m1_C2_private = (function (_super) {
         __extends(m1_C2_private, _super);
         function m1_C2_private() {
             _super.apply(this, arguments);
         }
         return m1_C2_private;
-    })(m1_c_private);
+    }(m1_c_private));
     var m1_C3_public = (function (_super) {
         __extends(m1_C3_public, _super);
         function m1_C3_public() {
             _super.apply(this, arguments);
         }
         return m1_C3_public;
-    })(m1_c_public);
+    }(m1_c_public));
     m1.m1_C3_public = m1_C3_public;
     var m1_C4_public = (function (_super) {
         __extends(m1_C4_public, _super);
@@ -109,29 +109,29 @@ var m1;
             _super.apply(this, arguments);
         }
         return m1_C4_public;
-    })(m1_c_private);
+    }(m1_c_private));
     m1.m1_C4_public = m1_C4_public;
     var m1_C5_private = (function () {
         function m1_C5_private() {
         }
         return m1_C5_private;
-    })();
+    }());
     var m1_C6_private = (function () {
         function m1_C6_private() {
         }
         return m1_C6_private;
-    })();
+    }());
     var m1_C7_public = (function () {
         function m1_C7_public() {
         }
         return m1_C7_public;
-    })();
+    }());
     m1.m1_C7_public = m1_C7_public;
     var m1_C8_public = (function () {
         function m1_C8_public() {
         }
         return m1_C8_public;
-    })();
+    }());
     m1.m1_C8_public = m1_C8_public;
     var m1_C9_private = (function (_super) {
         __extends(m1_C9_private, _super);
@@ -139,21 +139,21 @@ var m1;
             _super.apply(this, arguments);
         }
         return m1_C9_private;
-    })(m1_c_public);
+    }(m1_c_public));
     var m1_C10_private = (function (_super) {
         __extends(m1_C10_private, _super);
         function m1_C10_private() {
             _super.apply(this, arguments);
         }
         return m1_C10_private;
-    })(m1_c_private);
+    }(m1_c_private));
     var m1_C11_public = (function (_super) {
         __extends(m1_C11_public, _super);
         function m1_C11_public() {
             _super.apply(this, arguments);
         }
         return m1_C11_public;
-    })(m1_c_public);
+    }(m1_c_public));
     m1.m1_C11_public = m1_C11_public;
     var m1_C12_public = (function (_super) {
         __extends(m1_C12_public, _super);
@@ -161,7 +161,7 @@ var m1;
             _super.apply(this, arguments);
         }
         return m1_C12_public;
-    })(m1_c_private);
+    }(m1_c_private));
     m1.m1_C12_public = m1_C12_public;
 })(m1 || (m1 = {}));
 var glo_c_public = (function () {
@@ -170,23 +170,23 @@ var glo_c_public = (function () {
     glo_c_public.prototype.f1 = function () {
     };
     return glo_c_public;
-})();
+}());
 var glo_C3_public = (function (_super) {
     __extends(glo_C3_public, _super);
     function glo_C3_public() {
         _super.apply(this, arguments);
     }
     return glo_C3_public;
-})(glo_c_public);
+}(glo_c_public));
 var glo_C7_public = (function () {
     function glo_C7_public() {
     }
     return glo_C7_public;
-})();
+}());
 var glo_C11_public = (function (_super) {
     __extends(glo_C11_public, _super);
     function glo_C11_public() {
         _super.apply(this, arguments);
     }
     return glo_C11_public;
-})(glo_c_public);
+}(glo_c_public));
diff --git a/tests/baselines/reference/privacyGloFunc.js b/tests/baselines/reference/privacyGloFunc.js
index ff801078df569..153fa57e3d3d1 100644
--- a/tests/baselines/reference/privacyGloFunc.js
+++ b/tests/baselines/reference/privacyGloFunc.js
@@ -541,13 +541,13 @@ define(["require", "exports"], function (require, exports) {
             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(m1_c3_c1_2) {
             }
@@ -584,7 +584,7 @@ define(["require", "exports"], function (require, exports) {
                 return new C2_private(); //error
             };
             return C3_public;
-        })();
+        }());
         m1.C3_public = C3_public;
         var C4_private = (function () {
             function C4_private(m1_c4_c1_2) {
@@ -622,29 +622,29 @@ define(["require", "exports"], function (require, exports) {
                 return new C2_private();
             };
             return C4_private;
-        })();
+        }());
         var C5_public = (function () {
             function C5_public(m1_c5_c) {
             }
             return C5_public;
-        })();
+        }());
         m1.C5_public = C5_public;
         var C6_private = (function () {
             function C6_private(m1_c6_c) {
             }
             return C6_private;
-        })();
+        }());
         var C7_public = (function () {
             function C7_public(m1_c7_c) {
             }
             return C7_public;
-        })();
+        }());
         m1.C7_public = C7_public;
         var C8_private = (function () {
             function C8_private(m1_c8_c) {
             }
             return C8_private;
-        })();
+        }());
         function f1_public(m1_f1_arg) {
         }
         function f2_public(m1_f2_arg) {
@@ -692,13 +692,13 @@ define(["require", "exports"], function (require, exports) {
             m2_C1_public.prototype.f = 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(m2_c3_c1_2) {
             }
@@ -735,7 +735,7 @@ define(["require", "exports"], function (require, exports) {
                 return new m2_C2_private();
             };
             return m2_C3_public;
-        })();
+        }());
         m2.m2_C3_public = m2_C3_public;
         var m2_C4_private = (function () {
             function m2_C4_private(m2_c4_c1_2) {
@@ -773,29 +773,29 @@ define(["require", "exports"], function (require, exports) {
                 return new m2_C2_private();
             };
             return m2_C4_private;
-        })();
+        }());
         var m2_C5_public = (function () {
             function m2_C5_public(m2_c5_c) {
             }
             return m2_C5_public;
-        })();
+        }());
         m2.m2_C5_public = m2_C5_public;
         var m2_C6_private = (function () {
             function m2_C6_private(m2_c6_c) {
             }
             return m2_C6_private;
-        })();
+        }());
         var m2_C7_public = (function () {
             function m2_C7_public(m2_c7_c) {
             }
             return m2_C7_public;
-        })();
+        }());
         m2.m2_C7_public = m2_C7_public;
         var m2_C8_private = (function () {
             function m2_C8_private(m2_c8_c) {
             }
             return m2_C8_private;
-        })();
+        }());
         function f1_public(m2_f1_arg) {
         }
         function f2_public(m2_f2_arg) {
@@ -841,12 +841,12 @@ define(["require", "exports"], function (require, exports) {
         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(c7_c1_2) {
@@ -884,7 +884,7 @@ define(["require", "exports"], function (require, exports) {
             return new C5_private(); //error
         };
         return C7_public;
-    })();
+    }());
     exports.C7_public = C7_public;
     var C8_private = (function () {
         function C8_private(c8_c1_2) {
@@ -922,29 +922,29 @@ define(["require", "exports"], function (require, exports) {
             return new C5_private();
         };
         return C8_private;
-    })();
+    }());
     var C9_public = (function () {
         function C9_public(c9_c) {
         }
         return C9_public;
-    })();
+    }());
     exports.C9_public = C9_public;
     var C10_private = (function () {
         function C10_private(c10_c) {
         }
         return C10_private;
-    })();
+    }());
     var C11_public = (function () {
         function C11_public(c11_c) {
         }
         return C11_public;
-    })();
+    }());
     exports.C11_public = C11_public;
     var C12_private = (function () {
         function C12_private(c12_c) {
         }
         return C12_private;
-    })();
+    }());
     function f1_private(f1_arg) {
     }
     function f2_public(f2_arg) {
diff --git a/tests/baselines/reference/privacyGloGetter.js b/tests/baselines/reference/privacyGloGetter.js
index 34e4b69d39225..2ae94a0d321f9 100644
--- a/tests/baselines/reference/privacyGloGetter.js
+++ b/tests/baselines/reference/privacyGloGetter.js
@@ -97,13 +97,13 @@ var m1;
         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() {
         }
@@ -144,7 +144,7 @@ var m1;
             configurable: true
         });
         return C3_public;
-    })();
+    }());
     m1.C3_public = C3_public;
     var C4_private = (function () {
         function C4_private() {
@@ -186,13 +186,13 @@ var m1;
             configurable: true
         });
         return C4_private;
-    })();
+    }());
 })(m1 || (m1 = {}));
 var C6_public = (function () {
     function C6_public() {
     }
     return C6_public;
-})();
+}());
 var C7_public = (function () {
     function C7_public() {
     }
@@ -215,4 +215,4 @@ var C7_public = (function () {
         configurable: true
     });
     return C7_public;
-})();
+}());
diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js
index 7f832ef75fed9..407ac5bb8d5d3 100644
--- a/tests/baselines/reference/privacyGloImport.js
+++ b/tests/baselines/reference/privacyGloImport.js
@@ -161,7 +161,7 @@ var m1;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m1_M1_public.c1 = c1;
         function f1() {
             return new c1;
@@ -175,7 +175,7 @@ var m1;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m1_M2_private.c1 = c1;
         function f1() {
             return new c1;
@@ -242,7 +242,7 @@ var glo_M1_public;
         function c1() {
         }
         return c1;
-    })();
+    }());
     glo_M1_public.c1 = c1;
     function f1() {
         return new c1;
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.js b/tests/baselines/reference/privacyGloImportParseErrors.js
index f99fdaca8cc22..21175ff068de0 100644
--- a/tests/baselines/reference/privacyGloImportParseErrors.js
+++ b/tests/baselines/reference/privacyGloImportParseErrors.js
@@ -161,7 +161,7 @@ var m1;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m1_M1_public.c1 = c1;
         function f1() {
             return new c1;
@@ -175,7 +175,7 @@ var m1;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m1_M2_private.c1 = c1;
         function f1() {
             return new c1;
@@ -226,7 +226,7 @@ var glo_M1_public;
         function c1() {
         }
         return c1;
-    })();
+    }());
     glo_M1_public.c1 = c1;
     function f1() {
         return new c1;
diff --git a/tests/baselines/reference/privacyGloInterface.js b/tests/baselines/reference/privacyGloInterface.js
index f4469942b5452..671977678a39a 100644
--- a/tests/baselines/reference/privacyGloInterface.js
+++ b/tests/baselines/reference/privacyGloInterface.js
@@ -128,13 +128,13 @@ var m1;
         C1_public.prototype.f1 = function () {
         };
         return C1_public;
-    })();
+    }());
     m1.C1_public = C1_public;
     var C2_private = (function () {
         function C2_private() {
         }
         return C2_private;
-    })();
+    }());
 })(m1 || (m1 = {}));
 var C5_public = (function () {
     function C5_public() {
@@ -142,4 +142,4 @@ var C5_public = (function () {
     C5_public.prototype.f1 = function () {
     };
     return C5_public;
-})();
+}());
diff --git a/tests/baselines/reference/privacyGloVar.js b/tests/baselines/reference/privacyGloVar.js
index e4bda49698f34..678d6cfdc99ed 100644
--- a/tests/baselines/reference/privacyGloVar.js
+++ b/tests/baselines/reference/privacyGloVar.js
@@ -89,13 +89,13 @@ var m1;
         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() {
             this.C3_v11_private = new C1_public();
@@ -108,7 +108,7 @@ var m1;
             this.C3_v24_public = new C2_private(); // error
         }
         return C3_public;
-    })();
+    }());
     m1.C3_public = C3_public;
     var C4_public = (function () {
         function C4_public() {
@@ -122,7 +122,7 @@ var m1;
             this.C4_v24_public = new C2_private();
         }
         return C4_public;
-    })();
+    }());
     var m1_v1_private;
     var m1_v3_private;
     var m1_v11_private = new C1_public();
@@ -140,7 +140,7 @@ var glo_C1_public = (function () {
     glo_C1_public.prototype.f1 = function () {
     };
     return glo_C1_public;
-})();
+}());
 var glo_C3_public = (function () {
     function glo_C3_public() {
         this.glo_C3_v11_private = new glo_C1_public();
@@ -149,7 +149,7 @@ var glo_C3_public = (function () {
         this.glo_C3_v22_public = new glo_C1_public();
     }
     return glo_C3_public;
-})();
+}());
 var glo_v2_public;
 var glo_v12_public = new glo_C1_public();
 var glo_v22_public = new glo_C1_public();
diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js
index 13a6bc396eadf..debb1e3b4bd2b 100644
--- a/tests/baselines/reference/privacyImport.js
+++ b/tests/baselines/reference/privacyImport.js
@@ -366,7 +366,7 @@ var m1;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m1_M1_public.c1 = c1;
         function f1() {
             return new c1;
@@ -380,7 +380,7 @@ var m1;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m1_M2_private.c1 = c1;
         function f1() {
             return new c1;
@@ -449,7 +449,7 @@ var m2;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m2_M1_public.c1 = c1;
         function f1() {
             return new c1;
@@ -463,7 +463,7 @@ var m2;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m2_M2_private.c1 = c1;
         function f1() {
             return new c1;
@@ -531,7 +531,7 @@ var glo_M1_public;
         function c1() {
         }
         return c1;
-    })();
+    }());
     glo_M1_public.c1 = c1;
     function f1() {
         return new c1;
@@ -552,7 +552,7 @@ var glo_M3_private;
         function c1() {
         }
         return c1;
-    })();
+    }());
     glo_M3_private.c1 = c1;
     function f1() {
         return new c1;
diff --git a/tests/baselines/reference/privacyImportParseErrors.js b/tests/baselines/reference/privacyImportParseErrors.js
index 7a7e7141684fa..25d96b6156e56 100644
--- a/tests/baselines/reference/privacyImportParseErrors.js
+++ b/tests/baselines/reference/privacyImportParseErrors.js
@@ -366,7 +366,7 @@ var m1;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m1_M1_public.c1 = c1;
         function f1() {
             return new c1;
@@ -380,7 +380,7 @@ var m1;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m1_M2_private.c1 = c1;
         function f1() {
             return new c1;
@@ -433,7 +433,7 @@ var m2;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m2_M1_public.c1 = c1;
         function f1() {
             return new c1;
@@ -447,7 +447,7 @@ var m2;
             function c1() {
             }
             return c1;
-        })();
+        }());
         m2_M2_private.c1 = c1;
         function f1() {
             return new c1;
@@ -499,7 +499,7 @@ var glo_M1_public;
         function c1() {
         }
         return c1;
-    })();
+    }());
     glo_M1_public.c1 = c1;
     function f1() {
         return new c1;
@@ -513,7 +513,7 @@ var glo_M3_private;
         function c1() {
         }
         return c1;
-    })();
+    }());
     glo_M3_private.c1 = c1;
     function f1() {
         return new c1;
diff --git a/tests/baselines/reference/privacyInterface.js b/tests/baselines/reference/privacyInterface.js
index 78e87bc22d24f..59e10aca7ff49 100644
--- a/tests/baselines/reference/privacyInterface.js
+++ b/tests/baselines/reference/privacyInterface.js
@@ -274,13 +274,13 @@ var m1;
         C1_public.prototype.f1 = function () {
         };
         return C1_public;
-    })();
+    }());
     m1.C1_public = C1_public;
     var C2_private = (function () {
         function C2_private() {
         }
         return C2_private;
-    })();
+    }());
 })(m1 = exports.m1 || (exports.m1 = {}));
 var m2;
 (function (m2) {
@@ -290,13 +290,13 @@ var m2;
         C1_public.prototype.f1 = function () {
         };
         return C1_public;
-    })();
+    }());
     m2.C1_public = C1_public;
     var C2_private = (function () {
         function C2_private() {
         }
         return C2_private;
-    })();
+    }());
 })(m2 || (m2 = {}));
 var C5_public = (function () {
     function C5_public() {
@@ -304,10 +304,10 @@ var C5_public = (function () {
     C5_public.prototype.f1 = function () {
     };
     return C5_public;
-})();
+}());
 exports.C5_public = C5_public;
 var C6_private = (function () {
     function C6_private() {
     }
     return C6_private;
-})();
+}());
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
index e5c127272b7a4..0ab6d3e531e70 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.js
@@ -161,7 +161,7 @@ var m_private;
         function c_private() {
         }
         return c_private;
-    })();
+    }());
     m_private.c_private = c_private;
     (function (e_private) {
         e_private[e_private["Happy"] = 0] = "Happy";
@@ -179,7 +179,7 @@ var m_private;
             function c() {
             }
             return c;
-        })();
+        }());
         mi_private.c = c;
     })(mi_private = m_private.mi_private || (m_private.mi_private = {}));
 })(m_private || (m_private = {}));
@@ -190,7 +190,7 @@ var m_public;
         function c_public() {
         }
         return c_public;
-    })();
+    }());
     m_public.c_public = c_public;
     (function (e_public) {
         e_public[e_public["Happy"] = 0] = "Happy";
@@ -208,7 +208,7 @@ var m_public;
             function c() {
             }
             return c;
-        })();
+        }());
         mi_public.c = c;
     })(mi_public = m_public.mi_public || (m_public.mi_public = {}));
 })(m_public = exports.m_public || (exports.m_public = {}));
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
index 9cc4f6a9160c4..96f7b74b474c2 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.js
@@ -162,7 +162,7 @@ define(["require", "exports"], function (require, exports) {
             function c_private() {
             }
             return c_private;
-        })();
+        }());
         m_private.c_private = c_private;
         (function (e_private) {
             e_private[e_private["Happy"] = 0] = "Happy";
@@ -180,7 +180,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             mi_private.c = c;
         })(mi_private = m_private.mi_private || (m_private.mi_private = {}));
     })(m_private || (m_private = {}));
@@ -191,7 +191,7 @@ define(["require", "exports"], function (require, exports) {
             function c_public() {
             }
             return c_public;
-        })();
+        }());
         m_public.c_public = c_public;
         (function (e_public) {
             e_public[e_public["Happy"] = 0] = "Happy";
@@ -209,7 +209,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             mi_public.c = c;
         })(mi_public = m_public.mi_public || (m_public.mi_public = {}));
     })(m_public = exports.m_public || (exports.m_public = {}));
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
index 5cb455f47bc08..d8bf7c85d129a 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
@@ -57,7 +57,7 @@ var c_public = (function () {
     function c_public() {
     }
     return c_public;
-})();
+}());
 exports.c_public = c_public;
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.js]
 "use strict";
@@ -65,7 +65,7 @@ var c_public = (function () {
     function c_public() {
     }
     return c_public;
-})();
+}());
 exports.c_public = c_public;
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.js]
 "use strict";
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
index a03c7dcef6225..7f44dbe6257bf 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
@@ -58,7 +58,7 @@ define(["require", "exports"], function (require, exports) {
         function c_public() {
         }
         return c_public;
-    })();
+    }());
     exports.c_public = c_public;
 });
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js]
@@ -68,7 +68,7 @@ define(["require", "exports"], function (require, exports) {
         function c_public() {
         }
         return c_public;
-    })();
+    }());
     exports.c_public = c_public;
 });
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js]
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
index 5daa00d576465..852ae4d3f1998 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.js
@@ -109,7 +109,7 @@ define(["require", "exports"], function (require, exports) {
             function c_private() {
             }
             return c_private;
-        })();
+        }());
         m_private.c_private = c_private;
         (function (e_private) {
             e_private[e_private["Happy"] = 0] = "Happy";
@@ -127,7 +127,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             mi_private.c = c;
         })(mi_private = m_private.mi_private || (m_private.mi_private = {}));
     })(m_private || (m_private = {}));
@@ -138,7 +138,7 @@ define(["require", "exports"], function (require, exports) {
             function c_public() {
             }
             return c_public;
-        })();
+        }());
         m_public.c_public = c_public;
         (function (e_public) {
             e_public[e_public["Happy"] = 0] = "Happy";
@@ -156,7 +156,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             mi_public.c = c;
         })(mi_public = m_public.mi_public || (m_public.mi_public = {}));
     })(m_public = exports.m_public || (exports.m_public = {}));
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
index 2abc4b11d9364..1241165a8dcd3 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
@@ -110,7 +110,7 @@ define(["require", "exports"], function (require, exports) {
             function c_private() {
             }
             return c_private;
-        })();
+        }());
         m_private.c_private = c_private;
         (function (e_private) {
             e_private[e_private["Happy"] = 0] = "Happy";
@@ -128,7 +128,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             mi_private.c = c;
         })(mi_private = m_private.mi_private || (m_private.mi_private = {}));
     })(m_private || (m_private = {}));
@@ -139,7 +139,7 @@ define(["require", "exports"], function (require, exports) {
             function c_public() {
             }
             return c_public;
-        })();
+        }());
         m_public.c_public = c_public;
         (function (e_public) {
             e_public[e_public["Happy"] = 0] = "Happy";
@@ -157,7 +157,7 @@ define(["require", "exports"], function (require, exports) {
                 function c() {
                 }
                 return c;
-            })();
+            }());
             mi_public.c = c;
         })(mi_public = m_public.mi_public || (m_public.mi_public = {}));
     })(m_public = exports.m_public || (exports.m_public = {}));
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.js b/tests/baselines/reference/privacyTypeParameterOfFunction.js
index ec447d9ccbbcd..84034362fac87 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunction.js
+++ b/tests/baselines/reference/privacyTypeParameterOfFunction.js
@@ -138,12 +138,12 @@ var privateClass = (function () {
     function privateClass() {
     }
     return privateClass;
-})();
+}());
 var publicClass = (function () {
     function publicClass() {
     }
     return publicClass;
-})();
+}());
 exports.publicClass = publicClass;
 var publicClassWithWithPrivateTypeParameters = (function () {
     function publicClassWithWithPrivateTypeParameters() {
@@ -159,7 +159,7 @@ var publicClassWithWithPrivateTypeParameters = (function () {
     publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
     };
     return publicClassWithWithPrivateTypeParameters;
-})();
+}());
 exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
 var publicClassWithWithPublicTypeParameters = (function () {
     function publicClassWithWithPublicTypeParameters() {
@@ -173,7 +173,7 @@ var publicClassWithWithPublicTypeParameters = (function () {
     publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
     };
     return publicClassWithWithPublicTypeParameters;
-})();
+}());
 exports.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
 var privateClassWithWithPrivateTypeParameters = (function () {
     function privateClassWithWithPrivateTypeParameters() {
@@ -187,7 +187,7 @@ var privateClassWithWithPrivateTypeParameters = (function () {
     privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
     };
     return privateClassWithWithPrivateTypeParameters;
-})();
+}());
 var privateClassWithWithPublicTypeParameters = (function () {
     function privateClassWithWithPublicTypeParameters() {
     }
@@ -200,7 +200,7 @@ var privateClassWithWithPublicTypeParameters = (function () {
     privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
     };
     return privateClassWithWithPublicTypeParameters;
-})();
+}());
 // TypeParameter_0_of_exported_function_has_or_is_using_private_type_1
 function publicFunctionWithPrivateTypeParameters() {
 }
@@ -224,7 +224,7 @@ var publicClassWithWithPublicTypeParametersWithoutExtends = (function () {
     publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
     };
     return publicClassWithWithPublicTypeParametersWithoutExtends;
-})();
+}());
 exports.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
 var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
     function privateClassWithWithPublicTypeParametersWithoutExtends() {
@@ -238,7 +238,7 @@ var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
     privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
     };
     return privateClassWithWithPublicTypeParametersWithoutExtends;
-})();
+}());
 function publicFunctionWithPublicTypeParametersWithoutExtends() {
 }
 exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
index 41dbb84a3ff7f..3eb6027b05006 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
@@ -444,12 +444,12 @@ var privateClass = (function () {
     function privateClass() {
     }
     return privateClass;
-})();
+}());
 var publicClass = (function () {
     function publicClass() {
     }
     return publicClass;
-})();
+}());
 exports.publicClass = publicClass;
 var publicClassWithWithPrivateTypeParameters = (function () {
     function publicClassWithWithPrivateTypeParameters() {
@@ -463,7 +463,7 @@ var publicClassWithWithPrivateTypeParameters = (function () {
     publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
     };
     return publicClassWithWithPrivateTypeParameters;
-})();
+}());
 exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
 var publicClassWithWithPublicTypeParameters = (function () {
     function publicClassWithWithPublicTypeParameters() {
@@ -477,7 +477,7 @@ var publicClassWithWithPublicTypeParameters = (function () {
     publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
     };
     return publicClassWithWithPublicTypeParameters;
-})();
+}());
 exports.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
 var privateClassWithWithPrivateTypeParameters = (function () {
     function privateClassWithWithPrivateTypeParameters() {
@@ -491,7 +491,7 @@ var privateClassWithWithPrivateTypeParameters = (function () {
     privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
     };
     return privateClassWithWithPrivateTypeParameters;
-})();
+}());
 var privateClassWithWithPublicTypeParameters = (function () {
     function privateClassWithWithPublicTypeParameters() {
     }
@@ -504,7 +504,7 @@ var privateClassWithWithPublicTypeParameters = (function () {
     privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
     };
     return privateClassWithWithPublicTypeParameters;
-})();
+}());
 function publicFunctionWithPrivateTypeParameters() {
 }
 exports.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
@@ -527,7 +527,7 @@ var publicClassWithWithPublicTypeParametersWithoutExtends = (function () {
     publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
     };
     return publicClassWithWithPublicTypeParametersWithoutExtends;
-})();
+}());
 exports.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
 var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
     function privateClassWithWithPublicTypeParametersWithoutExtends() {
@@ -541,7 +541,7 @@ var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
     privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
     };
     return privateClassWithWithPublicTypeParametersWithoutExtends;
-})();
+}());
 function publicFunctionWithPublicTypeParametersWithoutExtends() {
 }
 exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
@@ -555,7 +555,7 @@ var publicClassWithWithPrivateModuleTypeParameters = (function () {
     publicClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
     };
     return publicClassWithWithPrivateModuleTypeParameters;
-})();
+}());
 exports.publicClassWithWithPrivateModuleTypeParameters = publicClassWithWithPrivateModuleTypeParameters;
 function publicFunctionWithPrivateMopduleTypeParameters() {
 }
@@ -568,7 +568,7 @@ var privateClassWithWithPrivateModuleTypeParameters = (function () {
     privateClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
     };
     return privateClassWithWithPrivateModuleTypeParameters;
-})();
+}());
 function privateFunctionWithPrivateMopduleTypeParameters() {
 }
 var publicModule;
@@ -577,12 +577,12 @@ var publicModule;
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     publicModule.publicClass = publicClass;
     var publicClassWithWithPrivateTypeParameters = (function () {
         function publicClassWithWithPrivateTypeParameters() {
@@ -596,7 +596,7 @@ var publicModule;
         publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
         };
         return publicClassWithWithPrivateTypeParameters;
-    })();
+    }());
     publicModule.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
     var publicClassWithWithPublicTypeParameters = (function () {
         function publicClassWithWithPublicTypeParameters() {
@@ -610,7 +610,7 @@ var publicModule;
         publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
         };
         return publicClassWithWithPublicTypeParameters;
-    })();
+    }());
     publicModule.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
     var privateClassWithWithPrivateTypeParameters = (function () {
         function privateClassWithWithPrivateTypeParameters() {
@@ -624,7 +624,7 @@ var publicModule;
         privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
         };
         return privateClassWithWithPrivateTypeParameters;
-    })();
+    }());
     var privateClassWithWithPublicTypeParameters = (function () {
         function privateClassWithWithPublicTypeParameters() {
         }
@@ -637,7 +637,7 @@ var publicModule;
         privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
         };
         return privateClassWithWithPublicTypeParameters;
-    })();
+    }());
     function publicFunctionWithPrivateTypeParameters() {
     }
     publicModule.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
@@ -660,7 +660,7 @@ var publicModule;
         publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
         };
         return publicClassWithWithPublicTypeParametersWithoutExtends;
-    })();
+    }());
     publicModule.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
     var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
         function privateClassWithWithPublicTypeParametersWithoutExtends() {
@@ -674,7 +674,7 @@ var publicModule;
         privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
         };
         return privateClassWithWithPublicTypeParametersWithoutExtends;
-    })();
+    }());
     function publicFunctionWithPublicTypeParametersWithoutExtends() {
     }
     publicModule.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
@@ -688,7 +688,7 @@ var publicModule;
         publicClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
         };
         return publicClassWithWithPrivateModuleTypeParameters;
-    })();
+    }());
     publicModule.publicClassWithWithPrivateModuleTypeParameters = publicClassWithWithPrivateModuleTypeParameters;
     function publicFunctionWithPrivateMopduleTypeParameters() {
     }
@@ -701,7 +701,7 @@ var publicModule;
         privateClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
         };
         return privateClassWithWithPrivateModuleTypeParameters;
-    })();
+    }());
     function privateFunctionWithPrivateMopduleTypeParameters() {
     }
 })(publicModule = exports.publicModule || (exports.publicModule = {}));
@@ -711,12 +711,12 @@ var privateModule;
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     privateModule.publicClass = publicClass;
     var publicClassWithWithPrivateTypeParameters = (function () {
         function publicClassWithWithPrivateTypeParameters() {
@@ -730,7 +730,7 @@ var privateModule;
         publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
         };
         return publicClassWithWithPrivateTypeParameters;
-    })();
+    }());
     privateModule.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
     var publicClassWithWithPublicTypeParameters = (function () {
         function publicClassWithWithPublicTypeParameters() {
@@ -744,7 +744,7 @@ var privateModule;
         publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
         };
         return publicClassWithWithPublicTypeParameters;
-    })();
+    }());
     privateModule.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
     var privateClassWithWithPrivateTypeParameters = (function () {
         function privateClassWithWithPrivateTypeParameters() {
@@ -758,7 +758,7 @@ var privateModule;
         privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
         };
         return privateClassWithWithPrivateTypeParameters;
-    })();
+    }());
     var privateClassWithWithPublicTypeParameters = (function () {
         function privateClassWithWithPublicTypeParameters() {
         }
@@ -771,7 +771,7 @@ var privateModule;
         privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
         };
         return privateClassWithWithPublicTypeParameters;
-    })();
+    }());
     function publicFunctionWithPrivateTypeParameters() {
     }
     privateModule.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
@@ -794,7 +794,7 @@ var privateModule;
         publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
         };
         return publicClassWithWithPublicTypeParametersWithoutExtends;
-    })();
+    }());
     privateModule.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
     var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
         function privateClassWithWithPublicTypeParametersWithoutExtends() {
@@ -808,7 +808,7 @@ var privateModule;
         privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
         };
         return privateClassWithWithPublicTypeParametersWithoutExtends;
-    })();
+    }());
     function publicFunctionWithPublicTypeParametersWithoutExtends() {
     }
     privateModule.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.js b/tests/baselines/reference/privacyTypeParametersOfClass.js
index 8118d94ab7d08..3d28e145b3202 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClass.js
+++ b/tests/baselines/reference/privacyTypeParametersOfClass.js
@@ -49,12 +49,12 @@ 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 () {
@@ -64,7 +64,7 @@ var publicClassWithPrivateTypeParameters = (function () {
         return val;
     };
     return publicClassWithPrivateTypeParameters;
-})();
+}());
 exports.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
 var publicClassWithPublicTypeParameters = (function () {
     function publicClassWithPublicTypeParameters() {
@@ -73,7 +73,7 @@ var publicClassWithPublicTypeParameters = (function () {
         return val;
     };
     return publicClassWithPublicTypeParameters;
-})();
+}());
 exports.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
 var privateClassWithPrivateTypeParameters = (function () {
     function privateClassWithPrivateTypeParameters() {
@@ -82,7 +82,7 @@ var privateClassWithPrivateTypeParameters = (function () {
         return val;
     };
     return privateClassWithPrivateTypeParameters;
-})();
+}());
 var privateClassWithPublicTypeParameters = (function () {
     function privateClassWithPublicTypeParameters() {
     }
@@ -90,7 +90,7 @@ var privateClassWithPublicTypeParameters = (function () {
         return val;
     };
     return privateClassWithPublicTypeParameters;
-})();
+}());
 var publicClassWithPublicTypeParametersWithoutExtends = (function () {
     function publicClassWithPublicTypeParametersWithoutExtends() {
     }
@@ -98,7 +98,7 @@ var publicClassWithPublicTypeParametersWithoutExtends = (function () {
         return val;
     };
     return publicClassWithPublicTypeParametersWithoutExtends;
-})();
+}());
 exports.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
 var privateClassWithPublicTypeParametersWithoutExtends = (function () {
     function privateClassWithPublicTypeParametersWithoutExtends() {
@@ -107,4 +107,4 @@ var privateClassWithPublicTypeParametersWithoutExtends = (function () {
         return val;
     };
     return privateClassWithPublicTypeParametersWithoutExtends;
-})();
+}());
diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
index e9e1ad218bdc4..3ccdec46d7c4a 100644
--- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
@@ -160,12 +160,12 @@ var privateClass = (function () {
     function privateClass() {
     }
     return privateClass;
-})();
+}());
 var publicClass = (function () {
     function publicClass() {
     }
     return publicClass;
-})();
+}());
 exports.publicClass = publicClass;
 var publicClassWithPrivateTypeParameters = (function () {
     function publicClassWithPrivateTypeParameters() {
@@ -174,7 +174,7 @@ var publicClassWithPrivateTypeParameters = (function () {
         return val;
     };
     return publicClassWithPrivateTypeParameters;
-})();
+}());
 exports.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
 var publicClassWithPublicTypeParameters = (function () {
     function publicClassWithPublicTypeParameters() {
@@ -183,7 +183,7 @@ var publicClassWithPublicTypeParameters = (function () {
         return val;
     };
     return publicClassWithPublicTypeParameters;
-})();
+}());
 exports.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
 var privateClassWithPrivateTypeParameters = (function () {
     function privateClassWithPrivateTypeParameters() {
@@ -192,7 +192,7 @@ var privateClassWithPrivateTypeParameters = (function () {
         return val;
     };
     return privateClassWithPrivateTypeParameters;
-})();
+}());
 var privateClassWithPublicTypeParameters = (function () {
     function privateClassWithPublicTypeParameters() {
     }
@@ -200,7 +200,7 @@ var privateClassWithPublicTypeParameters = (function () {
         return val;
     };
     return privateClassWithPublicTypeParameters;
-})();
+}());
 var publicClassWithPublicTypeParametersWithoutExtends = (function () {
     function publicClassWithPublicTypeParametersWithoutExtends() {
     }
@@ -208,7 +208,7 @@ var publicClassWithPublicTypeParametersWithoutExtends = (function () {
         return val;
     };
     return publicClassWithPublicTypeParametersWithoutExtends;
-})();
+}());
 exports.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
 var privateClassWithPublicTypeParametersWithoutExtends = (function () {
     function privateClassWithPublicTypeParametersWithoutExtends() {
@@ -217,7 +217,7 @@ var privateClassWithPublicTypeParametersWithoutExtends = (function () {
         return val;
     };
     return privateClassWithPublicTypeParametersWithoutExtends;
-})();
+}());
 var publicClassWithTypeParametersFromPrivateModule = (function () {
     function publicClassWithTypeParametersFromPrivateModule() {
     }
@@ -225,7 +225,7 @@ var publicClassWithTypeParametersFromPrivateModule = (function () {
         return val;
     };
     return publicClassWithTypeParametersFromPrivateModule;
-})();
+}());
 exports.publicClassWithTypeParametersFromPrivateModule = publicClassWithTypeParametersFromPrivateModule;
 var privateClassWithTypeParametersFromPrivateModule = (function () {
     function privateClassWithTypeParametersFromPrivateModule() {
@@ -234,19 +234,19 @@ var privateClassWithTypeParametersFromPrivateModule = (function () {
         return val;
     };
     return privateClassWithTypeParametersFromPrivateModule;
-})();
+}());
 var publicModule;
 (function (publicModule) {
     var privateClassInPublicModule = (function () {
         function privateClassInPublicModule() {
         }
         return privateClassInPublicModule;
-    })();
+    }());
     var publicClassInPublicModule = (function () {
         function publicClassInPublicModule() {
         }
         return publicClassInPublicModule;
-    })();
+    }());
     publicModule.publicClassInPublicModule = publicClassInPublicModule;
     var publicClassWithPrivateTypeParameters = (function () {
         function publicClassWithPrivateTypeParameters() {
@@ -255,7 +255,7 @@ var publicModule;
             return val;
         };
         return publicClassWithPrivateTypeParameters;
-    })();
+    }());
     publicModule.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
     var publicClassWithPublicTypeParameters = (function () {
         function publicClassWithPublicTypeParameters() {
@@ -264,7 +264,7 @@ var publicModule;
             return val;
         };
         return publicClassWithPublicTypeParameters;
-    })();
+    }());
     publicModule.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
     var privateClassWithPrivateTypeParameters = (function () {
         function privateClassWithPrivateTypeParameters() {
@@ -273,7 +273,7 @@ var publicModule;
             return val;
         };
         return privateClassWithPrivateTypeParameters;
-    })();
+    }());
     var privateClassWithPublicTypeParameters = (function () {
         function privateClassWithPublicTypeParameters() {
         }
@@ -281,7 +281,7 @@ var publicModule;
             return val;
         };
         return privateClassWithPublicTypeParameters;
-    })();
+    }());
     var publicClassWithPublicTypeParametersWithoutExtends = (function () {
         function publicClassWithPublicTypeParametersWithoutExtends() {
         }
@@ -289,7 +289,7 @@ var publicModule;
             return val;
         };
         return publicClassWithPublicTypeParametersWithoutExtends;
-    })();
+    }());
     publicModule.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
     var privateClassWithPublicTypeParametersWithoutExtends = (function () {
         function privateClassWithPublicTypeParametersWithoutExtends() {
@@ -298,7 +298,7 @@ var publicModule;
             return val;
         };
         return privateClassWithPublicTypeParametersWithoutExtends;
-    })();
+    }());
     var publicClassWithTypeParametersFromPrivateModule = (function () {
         function publicClassWithTypeParametersFromPrivateModule() {
         }
@@ -306,7 +306,7 @@ var publicModule;
             return val;
         };
         return publicClassWithTypeParametersFromPrivateModule;
-    })();
+    }());
     publicModule.publicClassWithTypeParametersFromPrivateModule = publicClassWithTypeParametersFromPrivateModule;
     var privateClassWithTypeParametersFromPrivateModule = (function () {
         function privateClassWithTypeParametersFromPrivateModule() {
@@ -315,7 +315,7 @@ var publicModule;
             return val;
         };
         return privateClassWithTypeParametersFromPrivateModule;
-    })();
+    }());
 })(publicModule = exports.publicModule || (exports.publicModule = {}));
 var privateModule;
 (function (privateModule) {
@@ -323,12 +323,12 @@ var privateModule;
         function privateClassInPrivateModule() {
         }
         return privateClassInPrivateModule;
-    })();
+    }());
     var publicClassInPrivateModule = (function () {
         function publicClassInPrivateModule() {
         }
         return publicClassInPrivateModule;
-    })();
+    }());
     privateModule.publicClassInPrivateModule = publicClassInPrivateModule;
     var publicClassWithPrivateTypeParameters = (function () {
         function publicClassWithPrivateTypeParameters() {
@@ -337,7 +337,7 @@ var privateModule;
             return val;
         };
         return publicClassWithPrivateTypeParameters;
-    })();
+    }());
     privateModule.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
     var publicClassWithPublicTypeParameters = (function () {
         function publicClassWithPublicTypeParameters() {
@@ -346,7 +346,7 @@ var privateModule;
             return val;
         };
         return publicClassWithPublicTypeParameters;
-    })();
+    }());
     privateModule.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
     var privateClassWithPrivateTypeParameters = (function () {
         function privateClassWithPrivateTypeParameters() {
@@ -355,7 +355,7 @@ var privateModule;
             return val;
         };
         return privateClassWithPrivateTypeParameters;
-    })();
+    }());
     var privateClassWithPublicTypeParameters = (function () {
         function privateClassWithPublicTypeParameters() {
         }
@@ -363,7 +363,7 @@ var privateModule;
             return val;
         };
         return privateClassWithPublicTypeParameters;
-    })();
+    }());
     var publicClassWithPublicTypeParametersWithoutExtends = (function () {
         function publicClassWithPublicTypeParametersWithoutExtends() {
         }
@@ -371,7 +371,7 @@ var privateModule;
             return val;
         };
         return publicClassWithPublicTypeParametersWithoutExtends;
-    })();
+    }());
     privateModule.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
     var privateClassWithPublicTypeParametersWithoutExtends = (function () {
         function privateClassWithPublicTypeParametersWithoutExtends() {
@@ -380,5 +380,5 @@ var privateModule;
             return val;
         };
         return privateClassWithPublicTypeParametersWithoutExtends;
-    })();
+    }());
 })(privateModule || (privateModule = {}));
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.js b/tests/baselines/reference/privacyTypeParametersOfInterface.js
index c77da126cb615..a330ea76e13d5 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterface.js
+++ b/tests/baselines/reference/privacyTypeParametersOfInterface.js
@@ -64,21 +64,21 @@ 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/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
index ae8ee2d43f325..7c92ed701d974 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
+++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
@@ -196,23 +196,23 @@ 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;
 var publicModule;
 (function (publicModule) {
@@ -220,23 +220,23 @@ var publicModule;
         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;
 })(publicModule = exports.publicModule || (exports.publicModule = {}));
 var privateModule;
@@ -245,22 +245,22 @@ var privateModule;
         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/privacyVar.js b/tests/baselines/reference/privacyVar.js
index b5a68268074f6..0d133743709c4 100644
--- a/tests/baselines/reference/privacyVar.js
+++ b/tests/baselines/reference/privacyVar.js
@@ -184,13 +184,13 @@ var m1;
         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() {
             this.C3_v11_private = new C1_public();
@@ -203,7 +203,7 @@ var m1;
             this.C3_v24_public = new C2_private(); // error
         }
         return C3_public;
-    })();
+    }());
     m1.C3_public = C3_public;
     var C4_public = (function () {
         function C4_public() {
@@ -217,7 +217,7 @@ var m1;
             this.C4_v24_public = new C2_private();
         }
         return C4_public;
-    })();
+    }());
     var m1_v1_private;
     var m1_v3_private;
     var m1_v11_private = new C1_public();
@@ -237,13 +237,13 @@ var m2;
         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() {
             this.m2_C3_v11_private = new m2_C1_public();
@@ -256,7 +256,7 @@ var m2;
             this.m2_C3_v24_public = new m2_C2_private();
         }
         return m2_C3_public;
-    })();
+    }());
     m2.m2_C3_public = m2_C3_public;
     var m2_C4_public = (function () {
         function m2_C4_public() {
@@ -270,7 +270,7 @@ var m2;
             this.m2_C4_v24_public = new m2_C2_private();
         }
         return m2_C4_public;
-    })();
+    }());
     var m2_v1_private;
     var m2_v3_private;
     var m2_v11_private = new m2_C1_public();
@@ -288,13 +288,13 @@ var glo_C1_public = (function () {
     glo_C1_public.prototype.f1 = function () {
     };
     return glo_C1_public;
-})();
+}());
 exports.glo_C1_public = glo_C1_public;
 var glo_C2_private = (function () {
     function glo_C2_private() {
     }
     return glo_C2_private;
-})();
+}());
 var glo_C3_public = (function () {
     function glo_C3_public() {
         this.glo_C3_v11_private = new glo_C1_public();
@@ -307,7 +307,7 @@ var glo_C3_public = (function () {
         this.glo_C3_v24_public = new glo_C2_private(); //error
     }
     return glo_C3_public;
-})();
+}());
 exports.glo_C3_public = glo_C3_public;
 var glo_C4_public = (function () {
     function glo_C4_public() {
@@ -321,7 +321,7 @@ var glo_C4_public = (function () {
         this.glo_C4_v24_public = new glo_C2_private();
     }
     return glo_C4_public;
-})();
+}());
 var glo_v1_private;
 var glo_v3_private;
 var glo_v11_private = new glo_C1_public();
diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js
index 5dd2e611ffb03..102aeea58a4d4 100644
--- a/tests/baselines/reference/privacyVarDeclFile.js
+++ b/tests/baselines/reference/privacyVarDeclFile.js
@@ -431,48 +431,48 @@ 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;
-})();
+}());
 var privateVarWithPrivatePropertyTypes;
 var privateVarWithPublicPropertyTypes;
 var publicClassWithPrivateModulePropertyTypes = (function () {
     function publicClassWithPrivateModulePropertyTypes() {
     }
     return publicClassWithPrivateModulePropertyTypes;
-})();
+}());
 exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
 var privateClassWithPrivateModulePropertyTypes = (function () {
     function privateClassWithPrivateModulePropertyTypes() {
     }
     return privateClassWithPrivateModulePropertyTypes;
-})();
+}());
 var privateVarWithPrivateModulePropertyTypes;
 var publicModule;
 (function (publicModule) {
@@ -480,48 +480,48 @@ var publicModule;
         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;
-    })();
+    }());
     var privateVarWithPrivatePropertyTypes;
     var privateVarWithPublicPropertyTypes;
     var publicClassWithPrivateModulePropertyTypes = (function () {
         function publicClassWithPrivateModulePropertyTypes() {
         }
         return publicClassWithPrivateModulePropertyTypes;
-    })();
+    }());
     publicModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
     var privateClassWithPrivateModulePropertyTypes = (function () {
         function privateClassWithPrivateModulePropertyTypes() {
         }
         return privateClassWithPrivateModulePropertyTypes;
-    })();
+    }());
     var privateVarWithPrivateModulePropertyTypes;
 })(publicModule = exports.publicModule || (exports.publicModule = {}));
 var privateModule;
@@ -530,48 +530,48 @@ var privateModule;
         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;
-    })();
+    }());
     var privateVarWithPrivatePropertyTypes;
     var privateVarWithPublicPropertyTypes;
     var publicClassWithPrivateModulePropertyTypes = (function () {
         function publicClassWithPrivateModulePropertyTypes() {
         }
         return publicClassWithPrivateModulePropertyTypes;
-    })();
+    }());
     privateModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
     var privateClassWithPrivateModulePropertyTypes = (function () {
         function privateClassWithPrivateModulePropertyTypes() {
         }
         return privateClassWithPrivateModulePropertyTypes;
-    })();
+    }());
     var privateVarWithPrivateModulePropertyTypes;
 })(privateModule || (privateModule = {}));
 //// [privacyVarDeclFile_GlobalFile.js]
@@ -579,12 +579,12 @@ var publicClassInGlobal = (function () {
     function publicClassInGlobal() {
     }
     return publicClassInGlobal;
-})();
+}());
 var publicClassWithWithPublicPropertyTypesInGlobal = (function () {
     function publicClassWithWithPublicPropertyTypesInGlobal() {
     }
     return publicClassWithWithPublicPropertyTypesInGlobal;
-})();
+}());
 var publicVarWithPublicPropertyTypesInGlobal;
 var publicModuleInGlobal;
 (function (publicModuleInGlobal) {
@@ -592,12 +592,12 @@ var publicModuleInGlobal;
         function privateClass() {
         }
         return privateClass;
-    })();
+    }());
     var publicClass = (function () {
         function publicClass() {
         }
         return publicClass;
-    })();
+    }());
     publicModuleInGlobal.publicClass = publicClass;
     var privateModule;
     (function (privateModule) {
@@ -605,84 +605,84 @@ var publicModuleInGlobal;
             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;
-        })();
+        }());
         var privateVarWithPrivatePropertyTypes;
         var privateVarWithPublicPropertyTypes;
         var publicClassWithPrivateModulePropertyTypes = (function () {
             function publicClassWithPrivateModulePropertyTypes() {
             }
             return publicClassWithPrivateModulePropertyTypes;
-        })();
+        }());
         privateModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
         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;
-    })();
+    }());
     var privateVarWithPrivatePropertyTypes;
     var privateVarWithPublicPropertyTypes;
     var publicClassWithPrivateModulePropertyTypes = (function () {
         function publicClassWithPrivateModulePropertyTypes() {
         }
         return publicClassWithPrivateModulePropertyTypes;
-    })();
+    }());
     publicModuleInGlobal.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
     var privateClassWithPrivateModulePropertyTypes = (function () {
         function privateClassWithPrivateModulePropertyTypes() {
         }
         return privateClassWithPrivateModulePropertyTypes;
-    })();
+    }());
     var privateVarWithPrivateModulePropertyTypes;
 })(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/privateAccessInSubclass1.js b/tests/baselines/reference/privateAccessInSubclass1.js
index b22af20af3705..188c3149fd03a 100644
--- a/tests/baselines/reference/privateAccessInSubclass1.js
+++ b/tests/baselines/reference/privateAccessInSubclass1.js
@@ -19,7 +19,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -29,4 +29,4 @@ var D = (function (_super) {
         this.options;
     };
     return D;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js b/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js
index 116b255a921d4..1a4ac4b167975 100644
--- a/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js
+++ b/tests/baselines/reference/privateClassPropertyAccessibleWithinClass.js
@@ -52,7 +52,7 @@ var C = (function () {
     C.foo = function () { return this.foo; };
     C.bar = function () { this.foo(); };
     return C;
-})();
+}());
 // added level of function nesting
 var C2 = (function () {
     function C2() {
@@ -96,4 +96,4 @@ var C2 = (function () {
         (function () { return _this.foo(); });
     };
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/privateIndexer.js b/tests/baselines/reference/privateIndexer.js
index 09f0c85ea5b79..8e6fefdbc0924 100644
--- a/tests/baselines/reference/privateIndexer.js
+++ b/tests/baselines/reference/privateIndexer.js
@@ -19,14 +19,14 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/privateInstanceMemberAccessibility.js b/tests/baselines/reference/privateInstanceMemberAccessibility.js
index 0ba2093a5c706..8fbe5121136fb 100644
--- a/tests/baselines/reference/privateInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/privateInstanceMemberAccessibility.js
@@ -23,7 +23,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -35,4 +35,4 @@ var Derived = (function (_super) {
         return _super.prototype.foo; // error
     };
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/privateInstanceVisibility.js b/tests/baselines/reference/privateInstanceVisibility.js
index b730a763e1e9f..86d9d42623697 100644
--- a/tests/baselines/reference/privateInstanceVisibility.js
+++ b/tests/baselines/reference/privateInstanceVisibility.js
@@ -51,7 +51,7 @@ var Test;
             }
         };
         return Example;
-    })();
+    }());
     Test.Example = Example;
 })(Test || (Test = {}));
 var C = (function () {
@@ -62,4 +62,4 @@ var C = (function () {
         this.x = other.x;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/privateInterfaceProperties.js b/tests/baselines/reference/privateInterfaceProperties.js
index 244f61a98c453..8e1a1ebf5ef74 100644
--- a/tests/baselines/reference/privateInterfaceProperties.js
+++ b/tests/baselines/reference/privateInterfaceProperties.js
@@ -15,10 +15,10 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 // should be ok 
 var c2 = (function () {
     function c2() {
     }
     return c2;
-})();
+}());
diff --git a/tests/baselines/reference/privatePropertyUsingObjectType.js b/tests/baselines/reference/privatePropertyUsingObjectType.js
index d3a0c1c87642d..0c16d8bafffe3 100644
--- a/tests/baselines/reference/privatePropertyUsingObjectType.js
+++ b/tests/baselines/reference/privatePropertyUsingObjectType.js
@@ -16,6 +16,6 @@ define(["require", "exports"], function (require, exports) {
         function FilterManager() {
         }
         return FilterManager;
-    })();
+    }());
     exports.FilterManager = FilterManager;
 });
diff --git a/tests/baselines/reference/privateStaticMemberAccessibility.js b/tests/baselines/reference/privateStaticMemberAccessibility.js
index 0b9be3b69ff8c..2074e5aa8649e 100644
--- a/tests/baselines/reference/privateStaticMemberAccessibility.js
+++ b/tests/baselines/reference/privateStaticMemberAccessibility.js
@@ -18,7 +18,7 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -27,4 +27,4 @@ var Derived = (function (_super) {
     }
     Derived.bar = Base.foo; // error
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule.js b/tests/baselines/reference/privateStaticNotAccessibleInClodule.js
index 47aa08dc71f12..cb67a15fb246b 100644
--- a/tests/baselines/reference/privateStaticNotAccessibleInClodule.js
+++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule.js
@@ -16,7 +16,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C;
 (function (C) {
     C.y = C.bar; // error
diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
index b67ca77dc2618..7ed6f3d679266 100644
--- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
+++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
@@ -25,14 +25,14 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 var D;
 (function (D) {
     D.y = D.bar; // error
diff --git a/tests/baselines/reference/privateVisibility.js b/tests/baselines/reference/privateVisibility.js
index d70d7b4756f74..71227b9e09bb7 100644
--- a/tests/baselines/reference/privateVisibility.js
+++ b/tests/baselines/reference/privateVisibility.js
@@ -35,7 +35,7 @@ var Foo = (function () {
     Foo.prototype.pubMeth = function () { this.privMeth(); };
     Foo.prototype.privMeth = function () { };
     return Foo;
-})();
+}());
 var f = new Foo();
 f.privMeth(); // should not work
 f.privProp; // should not work
@@ -49,7 +49,7 @@ var M;
             this.priv = 1;
         }
         return C;
-    })();
+    }());
     M.C = C;
     M.V = 0;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/privateVisibles.js b/tests/baselines/reference/privateVisibles.js
index b2cb673c681c2..4c3736449f10d 100644
--- a/tests/baselines/reference/privateVisibles.js
+++ b/tests/baselines/reference/privateVisibles.js
@@ -17,4 +17,4 @@ var Foo = (function () {
     }
     Foo.prototype.meth = function () { var q = this.pvar; };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/promiseChaining.js b/tests/baselines/reference/promiseChaining.js
index ce15e2d44c161..3f0900f7748ea 100644
--- a/tests/baselines/reference/promiseChaining.js
+++ b/tests/baselines/reference/promiseChaining.js
@@ -23,4 +23,4 @@ var Chain = (function () {
         return new Chain(result);
     };
     return Chain;
-})();
+}());
diff --git a/tests/baselines/reference/promiseChaining1.js b/tests/baselines/reference/promiseChaining1.js
index 001f1ffc1a676..b396261a59edd 100644
--- a/tests/baselines/reference/promiseChaining1.js
+++ b/tests/baselines/reference/promiseChaining1.js
@@ -23,4 +23,4 @@ var Chain2 = (function () {
         return new Chain2(result);
     };
     return Chain2;
-})();
+}());
diff --git a/tests/baselines/reference/promiseChaining2.js b/tests/baselines/reference/promiseChaining2.js
index ed03ab2c97ab9..d9ae5e8099c0f 100644
--- a/tests/baselines/reference/promiseChaining2.js
+++ b/tests/baselines/reference/promiseChaining2.js
@@ -23,4 +23,4 @@ var Chain2 = (function () {
         return new Chain2(result);
     };
     return Chain2;
-})();
+}());
diff --git a/tests/baselines/reference/properties.js b/tests/baselines/reference/properties.js
index 67bfc0d99033e..fc10342352963 100644
--- a/tests/baselines/reference/properties.js
+++ b/tests/baselines/reference/properties.js
@@ -28,7 +28,7 @@ var MyClass = (function () {
         configurable: true
     });
     return MyClass;
-})();
+}());
 //# sourceMappingURL=properties.js.map
 
 //// [properties.d.ts]
diff --git a/tests/baselines/reference/properties.sourcemap.txt b/tests/baselines/reference/properties.sourcemap.txt
index 40245a8976d95..8c99154125a47 100644
--- a/tests/baselines/reference/properties.sourcemap.txt
+++ b/tests/baselines/reference/properties.sourcemap.txt
@@ -142,7 +142,7 @@ sourceFile:properties.ts
 1->Emitted(14, 5) Source(13, 1) + SourceIndex(0)
 2 >Emitted(14, 19) Source(13, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/propertiesAndIndexers.js b/tests/baselines/reference/propertiesAndIndexers.js
index b7a39ae2330ee..591c4760e58ee 100644
--- a/tests/baselines/reference/propertiesAndIndexers.js
+++ b/tests/baselines/reference/propertiesAndIndexers.js
@@ -61,12 +61,12 @@ var P = (function () {
     function P() {
     }
     return P;
-})();
+}());
 var Q = (function (_super) {
     __extends(Q, _super);
     function Q() {
         _super.apply(this, arguments);
     }
     return Q;
-})(P);
+}(P));
 var c;
diff --git a/tests/baselines/reference/propertiesAndIndexersForNumericNames.js b/tests/baselines/reference/propertiesAndIndexersForNumericNames.js
index 975abdc00ec61..409107960b3c4 100644
--- a/tests/baselines/reference/propertiesAndIndexersForNumericNames.js
+++ b/tests/baselines/reference/propertiesAndIndexersForNumericNames.js
@@ -81,4 +81,4 @@ var C = (function () {
         this["0.000000000000000000012"] = "should've been in exponential form"; // No error
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/propertyAccess.js b/tests/baselines/reference/propertyAccess.js
index ed004b332cbc0..2dbb316d84852 100644
--- a/tests/baselines/reference/propertyAccess.js
+++ b/tests/baselines/reference/propertyAccess.js
@@ -160,14 +160,14 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var Compass;
 (function (Compass) {
     Compass[Compass["North"] = 0] = "North";
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.js
index c76ad3a116511..63f91ae4f44c7 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.js
@@ -46,7 +46,7 @@ var C = (function () {
         return a + x.getDate();
     };
     return C;
-})();
+}());
 var r = (new C()).f();
 var i;
 var r2 = i.foo.getDate();
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
index 35c279ba0ed32..bbd2def2206cb 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
@@ -93,7 +93,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { return ''; };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -103,7 +103,7 @@ var B = (function (_super) {
         return '';
     };
     return B;
-})(A);
+}(A));
 var C = (function () {
     function C() {
     }
@@ -117,7 +117,7 @@ var C = (function () {
         return a + x.foo();
     };
     return C;
-})();
+}());
 //class C<U extends T, T extends A> {
 //    f() {
 //        var x: U;
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
index 24c3fc505014b..76da06166d4f8 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
@@ -68,7 +68,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { return ''; };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -78,7 +78,7 @@ var B = (function (_super) {
         return '';
     };
     return B;
-})(A);
+}(A));
 var C = (function () {
     function C() {
     }
@@ -94,7 +94,7 @@ var C = (function () {
         return a + x.foo();
     };
     return C;
-})();
+}());
 var r1a = (new C()).f();
 var r1b = (new C()).g(new B());
 var i;
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js
index e1209fbfe8419..3c5a87e4d0603 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints4.js
@@ -42,7 +42,7 @@ var C = (function () {
         return a + x.notHere();
     };
     return C;
-})();
+}());
 var r = (new C()).f();
 var i;
 var r2 = i.foo.notHere();
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
index 37b8240b9ac12..c49153c59b066 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
@@ -55,7 +55,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { return ''; };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -65,7 +65,7 @@ var B = (function (_super) {
         return '';
     };
     return B;
-})(A);
+}(A));
 var C = (function () {
     function C() {
     }
@@ -75,7 +75,7 @@ var C = (function () {
         return a + x.foo() + x.notHere();
     };
     return C;
-})();
+}());
 var r = (new C()).f();
 var i;
 var r2 = i.foo.notHere();
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.js
index bed3e685dcf54..0e5a1ee7baea4 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.js
@@ -41,7 +41,7 @@ var C = (function () {
         return a + x.toString();
     };
     return C;
-})();
+}());
 var r = (new C()).f();
 var i;
 var r2 = i.foo.toString();
diff --git a/tests/baselines/reference/propertyAccessibility1.js b/tests/baselines/reference/propertyAccessibility1.js
index 9c4d0eb05827a..3ba7b297cedd0 100644
--- a/tests/baselines/reference/propertyAccessibility1.js
+++ b/tests/baselines/reference/propertyAccessibility1.js
@@ -12,6 +12,6 @@ var Foo = (function () {
         this.privProp = 0;
     }
     return Foo;
-})();
+}());
 var f = new Foo();
 f.privProp;
diff --git a/tests/baselines/reference/propertyAccessibility2.js b/tests/baselines/reference/propertyAccessibility2.js
index 3009a984186b6..afce6c4c24a79 100644
--- a/tests/baselines/reference/propertyAccessibility2.js
+++ b/tests/baselines/reference/propertyAccessibility2.js
@@ -11,5 +11,5 @@ var C = (function () {
     }
     C.x = 1;
     return C;
-})();
+}());
 var c = C.x;
diff --git a/tests/baselines/reference/propertyAndAccessorWithSameName.js b/tests/baselines/reference/propertyAndAccessorWithSameName.js
index f8978ac4d1812..ece999fac5403 100644
--- a/tests/baselines/reference/propertyAndAccessorWithSameName.js
+++ b/tests/baselines/reference/propertyAndAccessorWithSameName.js
@@ -31,7 +31,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -42,7 +42,7 @@ var D = (function () {
         configurable: true
     });
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
@@ -55,4 +55,4 @@ var E = (function () {
         configurable: true
     });
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/propertyAndFunctionWithSameName.js b/tests/baselines/reference/propertyAndFunctionWithSameName.js
index eb0b437fd5cac..bb979735172ad 100644
--- a/tests/baselines/reference/propertyAndFunctionWithSameName.js
+++ b/tests/baselines/reference/propertyAndFunctionWithSameName.js
@@ -19,10 +19,10 @@ var C = (function () {
         return 1;
     };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     D.prototype.x = function (v) { }; // error
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
index b87147d11cea0..f62acb89dfd07 100644
--- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
+++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
@@ -37,12 +37,12 @@ define(["require", "exports"], function (require, exports) {
         function Foo1() {
         }
         return Foo1;
-    })();
+    }());
     var Foo2 = (function () {
         function Foo2() {
         }
         return Foo2;
-    })();
+    }());
     var y;
     var y;
 });
diff --git a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.js b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.js
index ffbc946a368cd..f9e106a378652 100644
--- a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.js
+++ b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.js
@@ -26,7 +26,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b = {
     foo: null
diff --git a/tests/baselines/reference/propertyNamedPrototype.js b/tests/baselines/reference/propertyNamedPrototype.js
index 2af5e01de193d..34a967a0c916b 100644
--- a/tests/baselines/reference/propertyNamedPrototype.js
+++ b/tests/baselines/reference/propertyNamedPrototype.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/propertyNamesOfReservedWords.js b/tests/baselines/reference/propertyNamesOfReservedWords.js
index b2332345712e3..4c333f48cbb92 100644
--- a/tests/baselines/reference/propertyNamesOfReservedWords.js
+++ b/tests/baselines/reference/propertyNamesOfReservedWords.js
@@ -281,7 +281,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var r1 = c.abstract;
 var r2 = c.as;
diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.js b/tests/baselines/reference/propertyNamesWithStringLiteral.js
index 1474847723fe3..f17ddb84dc39c 100644
--- a/tests/baselines/reference/propertyNamesWithStringLiteral.js
+++ b/tests/baselines/reference/propertyNamesWithStringLiteral.js
@@ -21,7 +21,7 @@ var _Color = (function () {
     function _Color() {
     }
     return _Color;
-})();
+}());
 var Color;
 (function (Color) {
 })(Color || (Color = {}));
diff --git a/tests/baselines/reference/propertyOrdering.js b/tests/baselines/reference/propertyOrdering.js
index f0f4644a983bb..190117b66f44f 100644
--- a/tests/baselines/reference/propertyOrdering.js
+++ b/tests/baselines/reference/propertyOrdering.js
@@ -33,7 +33,7 @@ var Foo = (function () {
     };
     Foo.prototype.bar = function () { return this.store; }; // should be an error
     return Foo;
-})();
+}());
 var Bar = (function () {
     function Bar(store) {
         this._store = store;
@@ -42,4 +42,4 @@ var Bar = (function () {
         return this._store.length; // shouldn't be an error
     };
     return Bar;
-})();
+}());
diff --git a/tests/baselines/reference/propertyOrdering2.js b/tests/baselines/reference/propertyOrdering2.js
index 4c1cfc63d5c36..783e7c8d00088 100644
--- a/tests/baselines/reference/propertyOrdering2.js
+++ b/tests/baselines/reference/propertyOrdering2.js
@@ -18,4 +18,4 @@ var Foo = (function () {
         return this.y;
     };
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.js b/tests/baselines/reference/propertyParameterWithQuestionMark.js
index e3b6bd153c21d..511062663e86a 100644
--- a/tests/baselines/reference/propertyParameterWithQuestionMark.js
+++ b/tests/baselines/reference/propertyParameterWithQuestionMark.js
@@ -15,7 +15,7 @@ var C = (function () {
         this.x = x;
     }
     return C;
-})();
+}());
 // x should not be an optional property
 var v = {}; // Should fail
 var v2;
diff --git a/tests/baselines/reference/propertyWrappedInTry.js b/tests/baselines/reference/propertyWrappedInTry.js
index e7f8a28d6882f..96684f2b453e1 100644
--- a/tests/baselines/reference/propertyWrappedInTry.js
+++ b/tests/baselines/reference/propertyWrappedInTry.js
@@ -24,7 +24,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 try {
     bar = someInitThatMightFail();
 }
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js
index 19ec9f50d27b2..85f63e11c68be 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinClass.js
@@ -52,7 +52,7 @@ var C = (function () {
     C.foo = function () { return this.foo; };
     C.bar = function () { this.foo(); };
     return C;
-})();
+}());
 // added level of function nesting
 var C2 = (function () {
     function C2() {
@@ -96,4 +96,4 @@ var C2 = (function () {
         (function () { return _this.foo(); });
     };
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
index ce7bc5d0b4065..a87f67e15f288 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
@@ -30,7 +30,7 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -53,4 +53,4 @@ var C = (function (_super) {
     C.foo = function () { return this.x; };
     C.bar = function () { this.foo(); };
     return C;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
index e47e7e5a7d5e8..05dc85e251e1d 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
@@ -116,7 +116,7 @@ var Base = (function () {
         d4.x; // OK, accessed within their declaring class
     };
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
@@ -135,7 +135,7 @@ var Derived1 = (function (_super) {
         d4.x; // Error, isn't accessed through an instance of the enclosing class
     };
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
@@ -154,7 +154,7 @@ var Derived2 = (function (_super) {
         d4.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class or one of its subclasses
     };
     return Derived2;
-})(Base);
+}(Base));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3() {
@@ -173,7 +173,7 @@ var Derived3 = (function (_super) {
         d4.x; // Error, isn't accessed through an instance of the enclosing class
     };
     return Derived3;
-})(Derived1);
+}(Derived1));
 var Derived4 = (function (_super) {
     __extends(Derived4, _super);
     function Derived4() {
@@ -192,7 +192,7 @@ var Derived4 = (function (_super) {
         d4.x; // OK, accessed within a class derived from their declaring class, and through an instance of the enclosing class
     };
     return Derived4;
-})(Derived2);
+}(Derived2));
 var b;
 var d1;
 var d2;
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
index 0140e61406cd1..6675589226e93 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
@@ -26,7 +26,7 @@ var Base = (function () {
         this.x; // OK, accessed within their declaring class
     };
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -37,4 +37,4 @@ var Derived = (function (_super) {
         _super.prototype.x; // Error, x is not public
     };
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.js b/tests/baselines/reference/protectedInstanceMemberAccessibility.js
index ff4ae952249c3..eba89aac28ee8 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.js
@@ -57,7 +57,7 @@ var A = (function () {
         return "hello";
     };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -89,11 +89,11 @@ var B = (function (_super) {
         var c4 = c.z; // error
     };
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/protectedMembers.js b/tests/baselines/reference/protectedMembers.js
index f86818b6e659f..e541f697f4494 100644
--- a/tests/baselines/reference/protectedMembers.js
+++ b/tests/baselines/reference/protectedMembers.js
@@ -133,7 +133,7 @@ var C1 = (function () {
         return this.sx;
     };
     return C1;
-})();
+}());
 // Derived class accessing protected members
 var C2 = (function (_super) {
     __extends(C2, _super);
@@ -147,7 +147,7 @@ var C2 = (function (_super) {
         return _super.sf.call(this) + this.sx;
     };
     return C2;
-})(C1);
+}(C1));
 // Derived class making protected members public
 var C3 = (function (_super) {
     __extends(C3, _super);
@@ -161,7 +161,7 @@ var C3 = (function (_super) {
         return _super.sf.call(this);
     };
     return C3;
-})(C2);
+}(C2));
 var c1;
 var c2;
 var c3;
@@ -184,14 +184,14 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -205,30 +205,30 @@ var C = (function (_super) {
         e.x = 1;
     };
     return C;
-})(A);
+}(A));
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 var CC = (function () {
     // Error, constructor cannot be protected
     function CC() {
     }
     return CC;
-})();
+}());
 var A1 = (function () {
     function A1() {
     }
     return A1;
-})();
+}());
 var B1 = (function () {
     function B1() {
     }
     return B1;
-})();
+}());
 var a1;
 var b1;
 a1 = b1; // Error, B1 doesn't derive from A1
@@ -237,19 +237,19 @@ var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
         _super.apply(this, arguments);
     }
     return B2;
-})(A2);
+}(A2));
 var A3 = (function () {
     function A3() {
     }
     return A3;
-})();
+}());
 // Error x is protected in B3 but public in A3
 var B3 = (function (_super) {
     __extends(B3, _super);
@@ -257,4 +257,4 @@ var B3 = (function (_super) {
         _super.apply(this, arguments);
     }
     return B3;
-})(A3);
+}(A3));
diff --git a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
index 9edd43ad52ea1..323a5a2f2b6c3 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
@@ -59,7 +59,7 @@ var Base = (function () {
         Derived3.x; // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
     };
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
@@ -72,7 +72,7 @@ var Derived1 = (function (_super) {
         Derived3.x; // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
     };
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
@@ -85,7 +85,7 @@ var Derived2 = (function (_super) {
         Derived3.x; // Error, redefined in a subclass, can only be accessed in the declaring class or one of its subclasses
     };
     return Derived2;
-})(Base);
+}(Base));
 var Derived3 = (function (_super) {
     __extends(Derived3, _super);
     function Derived3() {
@@ -98,7 +98,7 @@ var Derived3 = (function (_super) {
         Derived3.x; // OK, accessed within their declaring class
     };
     return Derived3;
-})(Derived1);
+}(Derived1));
 Base.x; // Error, neither within their declaring class nor classes derived from their declaring class
 Derived1.x; // Error, neither within their declaring class nor classes derived from their declaring class
 Derived2.x; // Error, neither within their declaring class nor classes derived from their declaring class
diff --git a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
index 5a8b07df37108..1295dc7448e28 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
@@ -34,7 +34,7 @@ var Base = (function () {
         this.x; // OK, accessed within their declaring class
     };
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
@@ -45,7 +45,7 @@ var Derived1 = (function (_super) {
         _super.x; // Error, x is not public
     };
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
@@ -56,4 +56,4 @@ var Derived2 = (function (_super) {
         _super.x; // Error, x is not public
     };
     return Derived2;
-})(Derived1);
+}(Derived1));
diff --git a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js
index 7534850b34f6f..9177665469237 100644
--- a/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js
+++ b/tests/baselines/reference/protectedStaticNotAccessibleInClodule.js
@@ -17,7 +17,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C;
 (function (C) {
     C.f = C.foo; // OK
diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.js b/tests/baselines/reference/protoAsIndexInIndexExpression.js
index 715ac2c1007d2..2c9b0f7a7c743 100644
--- a/tests/baselines/reference/protoAsIndexInIndexExpression.js
+++ b/tests/baselines/reference/protoAsIndexInIndexExpression.js
@@ -37,4 +37,4 @@ var C = (function () {
         this["__proto__"] = 0;
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/protoInIndexer.js b/tests/baselines/reference/protoInIndexer.js
index 08e1fbc931c75..d1d47681e0c93 100644
--- a/tests/baselines/reference/protoInIndexer.js
+++ b/tests/baselines/reference/protoInIndexer.js
@@ -11,4 +11,4 @@ var X = (function () {
         this['__proto__'] = null; // used to cause ICE
     }
     return X;
-})();
+}());
diff --git a/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.js b/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.js
index 7267d2dad299b..3dd3a50321317 100644
--- a/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.js
+++ b/tests/baselines/reference/prototypeInstantiatedWithBaseConstraint.js
@@ -10,5 +10,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 C.prototype.x.boo; // No error, prototype is instantiated to any
diff --git a/tests/baselines/reference/publicIndexer.js b/tests/baselines/reference/publicIndexer.js
index 6fc5d81b62fa7..e55a6ace2c439 100644
--- a/tests/baselines/reference/publicIndexer.js
+++ b/tests/baselines/reference/publicIndexer.js
@@ -19,14 +19,14 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.js b/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.js
index 7c6202eec30e9..fc8b07a52bdbd 100644
--- a/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.js
+++ b/tests/baselines/reference/publicMemberImplementedAsPrivateInDerivedClass.js
@@ -12,4 +12,4 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js
index b0079c2f45b3b..f396c2483e80e 100644
--- a/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js
+++ b/tests/baselines/reference/qualifiedName_entity-name-resolution-does-not-affect-class-heritage.js
@@ -22,4 +22,4 @@ var Beta = (function (_super) {
         _super.apply(this, arguments);
     }
     return Beta;
-})(Alpha.x);
+}(Alpha.x));
diff --git a/tests/baselines/reference/quotedAccessorName1.js b/tests/baselines/reference/quotedAccessorName1.js
index 69e0fdb2c8e3b..fbc47ae18d29b 100644
--- a/tests/baselines/reference/quotedAccessorName1.js
+++ b/tests/baselines/reference/quotedAccessorName1.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/quotedAccessorName2.js b/tests/baselines/reference/quotedAccessorName2.js
index 5d2d4861550d4..a5a3cb3f59813 100644
--- a/tests/baselines/reference/quotedAccessorName2.js
+++ b/tests/baselines/reference/quotedAccessorName2.js
@@ -13,4 +13,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/quotedFunctionName1.js b/tests/baselines/reference/quotedFunctionName1.js
index 69f4f2cfaa3b7..f58d154bc7f96 100644
--- a/tests/baselines/reference/quotedFunctionName1.js
+++ b/tests/baselines/reference/quotedFunctionName1.js
@@ -9,4 +9,4 @@ var Test1 = (function () {
     }
     Test1.prototype["prop1"] = function () { };
     return Test1;
-})();
+}());
diff --git a/tests/baselines/reference/quotedFunctionName2.js b/tests/baselines/reference/quotedFunctionName2.js
index 3173ec29f13d3..1508305c96939 100644
--- a/tests/baselines/reference/quotedFunctionName2.js
+++ b/tests/baselines/reference/quotedFunctionName2.js
@@ -9,4 +9,4 @@ var Test1 = (function () {
     }
     Test1["prop1"] = function () { };
     return Test1;
-})();
+}());
diff --git a/tests/baselines/reference/quotedPropertyName1.js b/tests/baselines/reference/quotedPropertyName1.js
index 2b4176fc49229..91c0c2256e262 100644
--- a/tests/baselines/reference/quotedPropertyName1.js
+++ b/tests/baselines/reference/quotedPropertyName1.js
@@ -9,4 +9,4 @@ var Test1 = (function () {
         this["prop1"] = 0;
     }
     return Test1;
-})();
+}());
diff --git a/tests/baselines/reference/quotedPropertyName2.js b/tests/baselines/reference/quotedPropertyName2.js
index ebff9f5fca045..1c4d85076eac1 100644
--- a/tests/baselines/reference/quotedPropertyName2.js
+++ b/tests/baselines/reference/quotedPropertyName2.js
@@ -9,4 +9,4 @@ var Test1 = (function () {
     }
     Test1["prop1"] = 0;
     return Test1;
-})();
+}());
diff --git a/tests/baselines/reference/quotedPropertyName3.js b/tests/baselines/reference/quotedPropertyName3.js
index 4191418e42a3d..0b837addf2548 100644
--- a/tests/baselines/reference/quotedPropertyName3.js
+++ b/tests/baselines/reference/quotedPropertyName3.js
@@ -17,4 +17,4 @@ var Test = (function () {
         var y = x();
     };
     return Test;
-})();
+}());
diff --git a/tests/baselines/reference/raiseErrorOnParameterProperty.js b/tests/baselines/reference/raiseErrorOnParameterProperty.js
index 600e1916231b0..437da6c948f14 100644
--- a/tests/baselines/reference/raiseErrorOnParameterProperty.js
+++ b/tests/baselines/reference/raiseErrorOnParameterProperty.js
@@ -13,5 +13,5 @@ var C1 = (function () {
         this.x = x;
     }
     return C1;
-})();
+}());
 var c1 = new C1(0);
diff --git a/tests/baselines/reference/reachabilityChecks1.js b/tests/baselines/reference/reachabilityChecks1.js
index dcbfbe89de41a..97b914fc104e0 100644
--- a/tests/baselines/reference/reachabilityChecks1.js
+++ b/tests/baselines/reference/reachabilityChecks1.js
@@ -130,7 +130,7 @@ function f2() {
         function A() {
         }
         return A;
-    })();
+    }());
 }
 var B;
 (function (B) {
diff --git a/tests/baselines/reference/reassignStaticProp.js b/tests/baselines/reference/reassignStaticProp.js
index 4c8d117885575..2bf2bafa128e2 100644
--- a/tests/baselines/reference/reassignStaticProp.js
+++ b/tests/baselines/reference/reassignStaticProp.js
@@ -17,4 +17,4 @@ var foo = (function () {
     }
     foo.bar = 1;
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/recursiveBaseCheck3.js b/tests/baselines/reference/recursiveBaseCheck3.js
index aeb0d70240f0a..b032ce6774db3 100644
--- a/tests/baselines/reference/recursiveBaseCheck3.js
+++ b/tests/baselines/reference/recursiveBaseCheck3.js
@@ -16,12 +16,12 @@ var A = (function (_super) {
         _super.apply(this, arguments);
     }
     return A;
-})(C);
+}(C));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 (new C).blah;
diff --git a/tests/baselines/reference/recursiveBaseCheck4.js b/tests/baselines/reference/recursiveBaseCheck4.js
index 2e4a745a70317..07ba40c68b133 100644
--- a/tests/baselines/reference/recursiveBaseCheck4.js
+++ b/tests/baselines/reference/recursiveBaseCheck4.js
@@ -14,5 +14,5 @@ var M = (function (_super) {
         _super.apply(this, arguments);
     }
     return M;
-})(M);
+}(M));
 (new M).blah;
diff --git a/tests/baselines/reference/recursiveBaseCheck5.js b/tests/baselines/reference/recursiveBaseCheck5.js
index a27e8403e2abc..ac07ae9df4dc1 100644
--- a/tests/baselines/reference/recursiveBaseCheck5.js
+++ b/tests/baselines/reference/recursiveBaseCheck5.js
@@ -9,5 +9,5 @@ var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 (new X).blah;
diff --git a/tests/baselines/reference/recursiveBaseCheck6.js b/tests/baselines/reference/recursiveBaseCheck6.js
index 13b4944e96f5a..5b880c294b736 100644
--- a/tests/baselines/reference/recursiveBaseCheck6.js
+++ b/tests/baselines/reference/recursiveBaseCheck6.js
@@ -14,5 +14,5 @@ var S18 = (function (_super) {
         _super.apply(this, arguments);
     }
     return S18;
-})(S18);
+}(S18));
 (new S18()).blah;
diff --git a/tests/baselines/reference/recursiveBaseConstructorCreation1.js b/tests/baselines/reference/recursiveBaseConstructorCreation1.js
index d14a78ed908d3..dd79ba068bba2 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation1.js
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation1.js
@@ -17,12 +17,12 @@ var C1 = (function () {
     }
     C1.prototype.func = function (param) { };
     return C1;
-})();
+}());
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(C1);
+}(C1));
 var x = new C2(); // Valid
diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
index 224c13e776531..62e5958715e98 100644
--- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
+++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
@@ -23,7 +23,7 @@ var TypeScript2;
             this.prefix = "";
         }
         return MemberName;
-    })();
+    }());
     TypeScript2.MemberName = MemberName;
     var MemberNameArray = (function (_super) {
         __extends(MemberNameArray, _super);
@@ -31,6 +31,6 @@ var TypeScript2;
             _super.apply(this, arguments);
         }
         return MemberNameArray;
-    })(MemberName);
+    }(MemberName));
     TypeScript2.MemberNameArray = MemberNameArray;
 })(TypeScript2 || (TypeScript2 = {}));
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js b/tests/baselines/reference/recursiveClassReferenceTest.js
index 0e884b94e8e9e..3aa066d158d6b 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js
@@ -126,7 +126,7 @@ var Sample;
                         return true;
                     };
                     return StartFindAction;
-                })();
+                }());
                 Find.StartFindAction = StartFindAction;
             })(Find = Thing_1.Find || (Thing_1.Find = {}));
         })(Thing = Actions.Thing || (Actions.Thing = {}));
@@ -154,7 +154,7 @@ var Sample;
                 FindWidget.prototype.destroy = function () {
                 };
                 return FindWidget;
-            })();
+            }());
             Widgets.FindWidget = FindWidget;
         })(Widgets = Thing.Widgets || (Thing.Widgets = {}));
     })(Thing = Sample.Thing || (Sample.Thing = {}));
@@ -164,7 +164,7 @@ var AbstractMode = (function () {
     }
     AbstractMode.prototype.getInitialState = function () { return null; };
     return AbstractMode;
-})();
+}());
 var Sample;
 (function (Sample) {
     var Thing;
@@ -185,7 +185,7 @@ var Sample;
                     };
                     State.prototype.getMode = function () { return mode; };
                     return State;
-                })();
+                }());
                 PlainText.State = State;
                 var Mode = (function (_super) {
                     __extends(Mode, _super);
@@ -197,7 +197,7 @@ var Sample;
                         return new State(self);
                     };
                     return Mode;
-                })(AbstractMode);
+                }(AbstractMode));
                 PlainText.Mode = Mode;
             })(PlainText = Languages.PlainText || (Languages.PlainText = {}));
         })(Languages = Thing.Languages || (Thing.Languages = {}));
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map
index 60c5c552d831c..40f720effce7e 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js.map
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js.map
@@ -1,2 +1,2 @@
 //// [recursiveClassReferenceTest.js.map]
-{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAAC,IAAA,OAAO,CAUpB;IAVa,WAAA,OAAO;QAAC,IAAA,KAAK,CAU1B;QAVqB,WAAA,OAAK;YAAC,IAAA,IAAI,CAU/B;YAV2B,WAAA,IAAI,EAAC,CAAC;gBACjC;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV2B,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAU/B;QAAD,CAAC,EAVqB,KAAK,GAAL,aAAK,KAAL,aAAK,QAU1B;IAAD,CAAC,EAVa,OAAO,GAAP,cAAO,KAAP,cAAO,QAUpB;AAAD,CAAC,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO,EAAC,CAAC;YAC5B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAAA,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAA,CAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,MAAM,CAAC,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBmB,OAAO,GAAP,aAAO,KAAP,aAAO,QAoB1B;IAAD,CAAC,EApBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAoBlB;AAAD,CAAC,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,MAAM,CAAC,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS,EAAC,CAAC;gBAExC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;wBAA0B,8BAAY;oBAQtC,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,EAA0B,YAAY,EAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxB6B,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAwBtC;QAAD,CAAC,EAxBmB,SAAS,GAAT,eAAS,KAAT,eAAS,QAwB5B;IAAD,CAAC,EAxBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAwBlB;AAAD,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ"}
\ No newline at end of file
+{"version":3,"file":"recursiveClassReferenceTest.js","sourceRoot":"","sources":["recursiveClassReferenceTest.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,0EAA0E;;;;;;AA8B1E,IAAO,MAAM,CAUZ;AAVD,WAAO,MAAM;IAAC,IAAA,OAAO,CAUpB;IAVa,WAAA,OAAO;QAAC,IAAA,KAAK,CAU1B;QAVqB,WAAA,OAAK;YAAC,IAAA,IAAI,CAU/B;YAV2B,WAAA,IAAI,EAAC,CAAC;gBACjC;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBACF,sBAAC;gBAAD,CAAC,AARD,IAQC;gBARY,oBAAe,kBAQ3B,CAAA;YACF,CAAC,EAV2B,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAU/B;QAAD,CAAC,EAVqB,KAAK,GAAL,aAAK,KAAL,aAAK,QAU1B;IAAD,CAAC,EAVa,OAAO,GAAP,cAAO,KAAP,cAAO,QAUpB;AAAD,CAAC,EAVM,MAAM,KAAN,MAAM,QAUZ;AAED,IAAO,MAAM,CAoBZ;AApBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO,EAAC,CAAC;YAC5B;gBAKC,oBAAoB,SAAkC;oBAAlC,cAAS,GAAT,SAAS,CAAyB;oBAD9C,YAAO,GAAO,IAAI,CAAC;oBAEvB,aAAa;oBACb,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBANM,wBAAG,GAAV,UAAW,MAAyC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAAA,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAAA,CAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,MAAM,CAAC,OAAO,CAAC;gBAChB,CAAC;gBAEM,4BAAO,GAAd;gBAEA,CAAC;gBAEF,iBAAC;YAAD,CAAC,AAlBD,IAkBC;YAlBY,kBAAU,aAkBtB,CAAA;QACF,CAAC,EApBmB,OAAO,GAAP,aAAO,KAAP,aAAO,QAoB1B;IAAD,CAAC,EApBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAoBlB;AAAD,CAAC,EApBM,MAAM,KAAN,MAAM,QAoBZ;AAGD;IAAA;IAAuF,CAAC;IAA3C,sCAAe,GAAtB,cAAmC,MAAM,CAAC,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,IAAO,MAAM,CAwBZ;AAxBD,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS,EAAC,CAAC;gBAExC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,MAAM,CAAC,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;wBAA0B,8BAAY;oBAQtC,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC;oBAGF,WAAC;gBAAD,CAAC,AARD,CAA0B,YAAY,GAQrC;gBARY,cAAI,OAQhB,CAAA;YACF,CAAC,EAxB6B,SAAS,GAAT,mBAAS,KAAT,mBAAS,QAwBtC;QAAD,CAAC,EAxBmB,SAAS,GAAT,eAAS,KAAT,eAAS,QAwB5B;IAAD,CAAC,EAxBa,KAAK,GAAL,YAAK,KAAL,YAAK,QAwBlB;AAAD,CAAC,EAxBM,MAAM,KAAN,MAAM,QAwBZ"}
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
index 0036b8234d83e..25dc6a1900ddd 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
@@ -331,7 +331,7 @@ sourceFile:recursiveClassReferenceTest.ts
 1->Emitted(23, 21) Source(41, 2) + SourceIndex(0)
 2 >Emitted(23, 43) Source(41, 3) + SourceIndex(0)
 ---
->>>                })();
+>>>                }());
 1 >^^^^^^^^^^^^^^^^
 2 >                ^
 3 >                 
@@ -952,7 +952,7 @@ sourceFile:recursiveClassReferenceTest.ts
 1->Emitted(51, 17) Source(63, 2) + SourceIndex(0)
 2 >Emitted(51, 34) Source(63, 3) + SourceIndex(0)
 ---
->>>            })();
+>>>            }());
 1 >^^^^^^^^^^^^
 2 >            ^
 3 >             
@@ -1225,7 +1225,7 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >Emitted(61, 5) Source(67, 88) + SourceIndex(0)
 2 >Emitted(61, 24) Source(67, 89) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -1640,7 +1640,7 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >Emitted(82, 21) Source(89, 2) + SourceIndex(0)
 2 >Emitted(82, 33) Source(89, 3) + SourceIndex(0)
 ---
->>>                })();
+>>>                }());
 1 >^^^^^^^^^^^^^^^^
 2 >                ^
 3 >                 
@@ -1812,33 +1812,33 @@ sourceFile:recursiveClassReferenceTest.ts
 1->Emitted(94, 21) Source(99, 2) + SourceIndex(0)
 2 >Emitted(94, 32) Source(99, 3) + SourceIndex(0)
 ---
->>>                })(AbstractMode);
+>>>                }(AbstractMode));
 1->^^^^^^^^^^^^^^^^
 2 >                ^
 3 >                 
-4 >                 ^^
-5 >                   ^^^^^^^^^^^^
-6 >                               ^^
+4 >                 ^
+5 >                  ^^^^^^^^^^^^
+6 >                              ^^^
 7 >                                 ^^^^^^->
 1->
 2 >                }
 3 >                 
 4 >                 export class Mode extends 
-5 >                   AbstractMode
-6 >                                {
-  >                               
-  >                               		// scenario 2
-  >                               		public getInitialState(): IState {
-  >                               			return new State(self);
-  >                               		}
-  >                               
-  >                               
-  >                               	}
+5 >                  AbstractMode
+6 >                               {
+  >                              
+  >                              		// scenario 2
+  >                              		public getInitialState(): IState {
+  >                              			return new State(self);
+  >                              		}
+  >                              
+  >                              
+  >                              	}
 1->Emitted(95, 17) Source(99, 2) + SourceIndex(0)
 2 >Emitted(95, 18) Source(99, 3) + SourceIndex(0)
 3 >Emitted(95, 18) Source(91, 2) + SourceIndex(0)
-4 >Emitted(95, 20) Source(91, 28) + SourceIndex(0)
-5 >Emitted(95, 32) Source(91, 40) + SourceIndex(0)
+4 >Emitted(95, 19) Source(91, 28) + SourceIndex(0)
+5 >Emitted(95, 31) Source(91, 40) + SourceIndex(0)
 6 >Emitted(95, 34) Source(99, 3) + SourceIndex(0)
 ---
 >>>                PlainText.Mode = Mode;
diff --git a/tests/baselines/reference/recursiveCloduleReference.js b/tests/baselines/reference/recursiveCloduleReference.js
index 74072e653ef9f..07d80e6011a2c 100644
--- a/tests/baselines/reference/recursiveCloduleReference.js
+++ b/tests/baselines/reference/recursiveCloduleReference.js
@@ -17,7 +17,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
     var C;
     (function (C_1) {
diff --git a/tests/baselines/reference/recursiveComplicatedClasses.js b/tests/baselines/reference/recursiveComplicatedClasses.js
index e35931008b2a9..a57560244582f 100644
--- a/tests/baselines/reference/recursiveComplicatedClasses.js
+++ b/tests/baselines/reference/recursiveComplicatedClasses.js
@@ -35,7 +35,7 @@ var Signature = (function () {
         this.parameters = null;
     }
     return Signature;
-})();
+}());
 function aEnclosesB(a) {
     return true;
 }
@@ -47,25 +47,25 @@ var Symbol = (function () {
         return aEnclosesB(b);
     };
     return Symbol;
-})();
+}());
 var InferenceSymbol = (function (_super) {
     __extends(InferenceSymbol, _super);
     function InferenceSymbol() {
         _super.apply(this, arguments);
     }
     return InferenceSymbol;
-})(Symbol);
+}(Symbol));
 var ParameterSymbol = (function (_super) {
     __extends(ParameterSymbol, _super);
     function ParameterSymbol() {
         _super.apply(this, arguments);
     }
     return ParameterSymbol;
-})(InferenceSymbol);
+}(InferenceSymbol));
 var TypeSymbol = (function (_super) {
     __extends(TypeSymbol, _super);
     function TypeSymbol() {
         _super.apply(this, arguments);
     }
     return TypeSymbol;
-})(InferenceSymbol);
+}(InferenceSymbol));
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
index 2cc10db27c0e1..d759bc2f296a7 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
@@ -23,7 +23,7 @@ define(["require", "exports"], function (require, exports) {
         function ClassB() {
         }
         return ClassB;
-    })();
+    }());
     return ClassB;
 });
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js]
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
index f1e5753360f97..7704b38f68ddb 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
@@ -27,7 +27,7 @@ define(["require", "exports"], function (require, exports) {
         function ClassB() {
         }
         return ClassB;
-    })();
+    }());
     return ClassB;
 });
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js]
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
index c195f13a5edbe..a46be3bdafc94 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
@@ -31,7 +31,7 @@ define(["require", "exports"], function (require, exports) {
         function ClassB() {
         }
         return ClassB;
-    })();
+    }());
     return ClassB;
 });
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js]
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
index 59726c68c258b..55f89491bf861 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
@@ -24,7 +24,7 @@ define(["require", "exports"], function (require, exports) {
         function ClassB() {
         }
         return ClassB;
-    })();
+    }());
     return ClassB;
 });
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js]
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
index 7bd4b7dce4a41..44464fd300ea4 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
@@ -32,7 +32,7 @@ define(["require", "exports"], function (require, exports) {
         function ClassB() {
         }
         return ClassB;
-    })();
+    }());
     return ClassB;
 });
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js]
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
index 268352c001ab6..a457802041b31 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
@@ -40,7 +40,7 @@ define(["require", "exports"], function (require, exports) {
         function ClassB() {
         }
         return ClassB;
-    })();
+    }());
     return ClassB;
 });
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js]
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
index be43b42e75f19..9a29c2bf9498c 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
@@ -45,7 +45,7 @@ define(["require", "exports"], function (require, exports) {
         function ClassB() {
         }
         return ClassB;
-    })();
+    }());
     return ClassB;
 });
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js]
diff --git a/tests/baselines/reference/recursiveFunctionTypes.js b/tests/baselines/reference/recursiveFunctionTypes.js
index 040c323066d13..6ff9e4eb997b3 100644
--- a/tests/baselines/reference/recursiveFunctionTypes.js
+++ b/tests/baselines/reference/recursiveFunctionTypes.js
@@ -60,7 +60,7 @@ var C = (function () {
     }
     C.g = function (t) { };
     return C;
-})();
+}());
 C.g(3); // error
 var f4;
 f4 = 3; // error
diff --git a/tests/baselines/reference/recursiveFunctionTypes1.js b/tests/baselines/reference/recursiveFunctionTypes1.js
index c4c255d5e4431..d219c74162590 100644
--- a/tests/baselines/reference/recursiveFunctionTypes1.js
+++ b/tests/baselines/reference/recursiveFunctionTypes1.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.g = function (t) { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/recursiveGetterAccess.js b/tests/baselines/reference/recursiveGetterAccess.js
index 1dea2e02d3a98..efb9dda3b31d0 100644
--- a/tests/baselines/reference/recursiveGetterAccess.js
+++ b/tests/baselines/reference/recursiveGetterAccess.js
@@ -15,4 +15,4 @@ var MyClass = (function () {
         configurable: true
     });
     return MyClass;
-})();
+}());
diff --git a/tests/baselines/reference/recursiveInheritance3.js b/tests/baselines/reference/recursiveInheritance3.js
index bc9fb6cb4f958..564d4fe6f3c64 100644
--- a/tests/baselines/reference/recursiveInheritance3.js
+++ b/tests/baselines/reference/recursiveInheritance3.js
@@ -15,4 +15,4 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { return x; };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/recursiveMods.js b/tests/baselines/reference/recursiveMods.js
index b25daa169cae6..86b3d47a48ede 100644
--- a/tests/baselines/reference/recursiveMods.js
+++ b/tests/baselines/reference/recursiveMods.js
@@ -32,7 +32,7 @@ var Foo;
         function C() {
         }
         return C;
-    })();
+    }());
     Foo.C = C;
 })(Foo = exports.Foo || (exports.Foo = {}));
 var Foo;
diff --git a/tests/baselines/reference/recursiveProperties.js b/tests/baselines/reference/recursiveProperties.js
index 84d9ebcd27cd0..35a284dac89de 100644
--- a/tests/baselines/reference/recursiveProperties.js
+++ b/tests/baselines/reference/recursiveProperties.js
@@ -17,7 +17,7 @@ var A = (function () {
         configurable: true
     });
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
@@ -27,4 +27,4 @@ var B = (function () {
         configurable: true
     });
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/recursiveSpecializationOfSignatures.js b/tests/baselines/reference/recursiveSpecializationOfSignatures.js
index 7542e85616a53..496a74f8983c8 100644
--- a/tests/baselines/reference/recursiveSpecializationOfSignatures.js
+++ b/tests/baselines/reference/recursiveSpecializationOfSignatures.js
@@ -18,4 +18,4 @@ var S0 = (function () {
         configurable: true
     });
     return S0;
-})();
+}());
diff --git a/tests/baselines/reference/recursiveTypeInGenericConstraint.js b/tests/baselines/reference/recursiveTypeInGenericConstraint.js
index 16ebdd2f6d96f..2fb45e1b9e36d 100644
--- a/tests/baselines/reference/recursiveTypeInGenericConstraint.js
+++ b/tests/baselines/reference/recursiveTypeInGenericConstraint.js
@@ -18,15 +18,15 @@ var G = (function () {
     function G() {
     }
     return G;
-})();
+}());
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var c1 = new Foo(); // ok, circularity in assignment compat check causes success
diff --git a/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.js b/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.js
index 45761b9bc284f..7a889a8a62ac6 100644
--- a/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.js
+++ b/tests/baselines/reference/recursiveTypeParameterConstraintReferenceLacksTypeArgs.js
@@ -6,4 +6,4 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/recursiveTypeParameterReferenceError1.js b/tests/baselines/reference/recursiveTypeParameterReferenceError1.js
index 4bc466bc6cf7d..a866b4fc78c09 100644
--- a/tests/baselines/reference/recursiveTypeParameterReferenceError1.js
+++ b/tests/baselines/reference/recursiveTypeParameterReferenceError1.js
@@ -22,13 +22,13 @@ var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 var f;
 var r = f.z;
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var f2;
 var r2 = f2.ofC4;
diff --git a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js
index 0cef9be47abe0..c2286901a2997 100644
--- a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js
+++ b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.js
@@ -48,12 +48,12 @@ var List = (function () {
     function List() {
     }
     return List;
-})();
+}());
 var MyList = (function () {
     function MyList() {
     }
     return MyList;
-})();
+}());
 function foo(x) {
 }
 function foo2(x) {
diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
index 48e8b1c4eba00..92cc2f72cac4f 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
@@ -47,7 +47,7 @@ var MsPortal;
                     function ItemValue(value) {
                     }
                     return ItemValue;
-                })();
+                }());
                 ItemList.ItemValue = ItemValue;
                 var ViewModel = (function (_super) {
                     __extends(ViewModel, _super);
@@ -55,7 +55,7 @@ var MsPortal;
                         _super.apply(this, arguments);
                     }
                     return ViewModel;
-                })(ItemValue);
+                }(ItemValue));
                 ItemList.ViewModel = ViewModel;
             })(ItemList = Base.ItemList || (Base.ItemList = {}));
         })(Base = Controls.Base || (Controls.Base = {}));
diff --git a/tests/baselines/reference/reexportClassDefinition.js b/tests/baselines/reference/reexportClassDefinition.js
index 7c836e056e447..ab5279d1d4721 100644
--- a/tests/baselines/reference/reexportClassDefinition.js
+++ b/tests/baselines/reference/reexportClassDefinition.js
@@ -23,7 +23,7 @@ var x = (function () {
     function x() {
     }
     return x;
-})();
+}());
 module.exports = x;
 //// [foo2.js]
 "use strict";
@@ -45,4 +45,4 @@ var x = (function (_super) {
         _super.apply(this, arguments);
     }
     return x;
-})(foo2.x);
+}(foo2.x));
diff --git a/tests/baselines/reference/requireEmitSemicolon.js b/tests/baselines/reference/requireEmitSemicolon.js
index ea0b4243ff483..7ac73b6f3dfa9 100644
--- a/tests/baselines/reference/requireEmitSemicolon.js
+++ b/tests/baselines/reference/requireEmitSemicolon.js
@@ -28,7 +28,7 @@ define(["require", "exports"], function (require, exports) {
             function Person(name) {
             }
             return Person;
-        })();
+        }());
         Models.Person = Person;
     })(Models = exports.Models || (exports.Models = {}));
 });
@@ -44,7 +44,7 @@ define(["require", "exports", "requireEmitSemicolon_0"], function (require, expo
                 return new P.Models.Person("Rock");
             };
             return DB;
-        })();
+        }());
         Database.DB = DB;
     })(Database = exports.Database || (exports.Database = {}));
 });
diff --git a/tests/baselines/reference/requiredInitializedParameter2.js b/tests/baselines/reference/requiredInitializedParameter2.js
index 3c69d54e1d949..b46a6edfeb0aa 100644
--- a/tests/baselines/reference/requiredInitializedParameter2.js
+++ b/tests/baselines/reference/requiredInitializedParameter2.js
@@ -15,4 +15,4 @@ var C1 = (function () {
         if (a === void 0) { a = 0; }
     };
     return C1;
-})();
+}());
diff --git a/tests/baselines/reference/requiredInitializedParameter3.js b/tests/baselines/reference/requiredInitializedParameter3.js
index 68e1aa696eab8..983955b79e832 100644
--- a/tests/baselines/reference/requiredInitializedParameter3.js
+++ b/tests/baselines/reference/requiredInitializedParameter3.js
@@ -15,7 +15,7 @@ var C1 = (function () {
         if (a === void 0) { a = 0; }
     };
     return C1;
-})();
+}());
 
 
 //// [requiredInitializedParameter3.d.ts]
diff --git a/tests/baselines/reference/requiredInitializedParameter4.js b/tests/baselines/reference/requiredInitializedParameter4.js
index 3b23f119391b3..11abdc20f411e 100644
--- a/tests/baselines/reference/requiredInitializedParameter4.js
+++ b/tests/baselines/reference/requiredInitializedParameter4.js
@@ -11,7 +11,7 @@ var C1 = (function () {
         if (a === void 0) { a = 0; }
     };
     return C1;
-})();
+}());
 
 
 //// [requiredInitializedParameter4.d.ts]
diff --git a/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.js b/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.js
index ac73145ee504e..7793fc6c650bf 100644
--- a/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.js
+++ b/tests/baselines/reference/resolveTypeAliasWithSameLetDeclarationName1.js
@@ -9,5 +9,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var baz;
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
index 3ba03a1e03c49..6e621a1880595 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
@@ -1063,7 +1063,7 @@ var rionegrensis;
             return x;
         };
         return caniventer;
-    })(Lanthanum.nitidus);
+    }(Lanthanum.nitidus));
     rionegrensis.caniventer = caniventer;
     var veraecrucis = (function (_super) {
         __extends(veraecrucis, _super);
@@ -1101,7 +1101,7 @@ var rionegrensis;
             return x;
         };
         return veraecrucis;
-    })(trivirgatus.mixtus);
+    }(trivirgatus.mixtus));
     rionegrensis.veraecrucis = veraecrucis;
 })(rionegrensis || (rionegrensis = {}));
 var julianae;
@@ -1110,7 +1110,7 @@ var julianae;
         function steerii() {
         }
         return steerii;
-    })();
+    }());
     julianae.steerii = steerii;
     var nudicaudus = (function () {
         function nudicaudus() {
@@ -1146,7 +1146,7 @@ var julianae;
             return x;
         };
         return nudicaudus;
-    })();
+    }());
     julianae.nudicaudus = nudicaudus;
     var galapagoensis = (function () {
         function galapagoensis() {
@@ -1194,7 +1194,7 @@ var julianae;
             return x;
         };
         return galapagoensis;
-    })();
+    }());
     julianae.galapagoensis = galapagoensis;
     var albidens = (function () {
         function albidens() {
@@ -1242,7 +1242,7 @@ var julianae;
             return x;
         };
         return albidens;
-    })();
+    }());
     julianae.albidens = albidens;
     var oralis = (function (_super) {
         __extends(oralis, _super);
@@ -1328,7 +1328,7 @@ var julianae;
             return x;
         };
         return oralis;
-    })(caurinus.psilurus);
+    }(caurinus.psilurus));
     julianae.oralis = oralis;
     var sumatrana = (function (_super) {
         __extends(sumatrana, _super);
@@ -1378,7 +1378,7 @@ var julianae;
             return x;
         };
         return sumatrana;
-    })(Lanthanum.jugularis);
+    }(Lanthanum.jugularis));
     julianae.sumatrana = sumatrana;
     var gerbillus = (function () {
         function gerbillus() {
@@ -1450,7 +1450,7 @@ var julianae;
             return x;
         };
         return gerbillus;
-    })();
+    }());
     julianae.gerbillus = gerbillus;
     var acariensis = (function () {
         function acariensis() {
@@ -1528,7 +1528,7 @@ var julianae;
             return x;
         };
         return acariensis;
-    })();
+    }());
     julianae.acariensis = acariensis;
     var durangae = (function (_super) {
         __extends(durangae, _super);
@@ -1554,7 +1554,7 @@ var julianae;
             return x;
         };
         return durangae;
-    })(dogramacii.aurata);
+    }(dogramacii.aurata));
     julianae.durangae = durangae;
 })(julianae || (julianae = {}));
 var ruatanica;
@@ -1575,7 +1575,7 @@ var ruatanica;
             return x;
         };
         return hector;
-    })();
+    }());
     ruatanica.hector = hector;
 })(ruatanica || (ruatanica = {}));
 var Lanthanum;
@@ -1602,7 +1602,7 @@ var Lanthanum;
             return x;
         };
         return suillus;
-    })();
+    }());
     Lanthanum.suillus = suillus;
     var nitidus = (function (_super) {
         __extends(nitidus, _super);
@@ -1670,7 +1670,7 @@ var Lanthanum;
             return x;
         };
         return nitidus;
-    })(argurus.gilbertii);
+    }(argurus.gilbertii));
     Lanthanum.nitidus = nitidus;
     var megalonyx = (function (_super) {
         __extends(megalonyx, _super);
@@ -1726,7 +1726,7 @@ var Lanthanum;
             return x;
         };
         return megalonyx;
-    })(caurinus.johorensis);
+    }(caurinus.johorensis));
     Lanthanum.megalonyx = megalonyx;
     var jugularis = (function () {
         function jugularis() {
@@ -1816,7 +1816,7 @@ var Lanthanum;
             return x;
         };
         return jugularis;
-    })();
+    }());
     Lanthanum.jugularis = jugularis;
 })(Lanthanum || (Lanthanum = {}));
 var rendalli;
@@ -1911,7 +1911,7 @@ var rendalli;
             return x;
         };
         return zuluensis;
-    })(julianae.steerii);
+    }(julianae.steerii));
     rendalli.zuluensis = zuluensis;
     var moojeni = (function () {
         function moojeni() {
@@ -1977,7 +1977,7 @@ var rendalli;
             return x;
         };
         return moojeni;
-    })();
+    }());
     rendalli.moojeni = moojeni;
     var crenulata = (function (_super) {
         __extends(crenulata, _super);
@@ -2003,7 +2003,7 @@ var rendalli;
             return x;
         };
         return crenulata;
-    })(trivirgatus.falconeri);
+    }(trivirgatus.falconeri));
     rendalli.crenulata = crenulata;
 })(rendalli || (rendalli = {}));
 var trivirgatus;
@@ -2060,7 +2060,7 @@ var trivirgatus;
             return x;
         };
         return tumidifrons;
-    })();
+    }());
     trivirgatus.tumidifrons = tumidifrons;
     var mixtus = (function (_super) {
         __extends(mixtus, _super);
@@ -2110,7 +2110,7 @@ var trivirgatus;
             return x;
         };
         return mixtus;
-    })(argurus.pygmaea);
+    }(argurus.pygmaea));
     trivirgatus.mixtus = mixtus;
     var lotor = (function () {
         function lotor() {
@@ -2128,7 +2128,7 @@ var trivirgatus;
             return x;
         };
         return lotor;
-    })();
+    }());
     trivirgatus.lotor = lotor;
     var falconeri = (function () {
         function falconeri() {
@@ -2176,7 +2176,7 @@ var trivirgatus;
             return x;
         };
         return falconeri;
-    })();
+    }());
     trivirgatus.falconeri = falconeri;
     var oconnelli = (function () {
         function oconnelli() {
@@ -2266,7 +2266,7 @@ var trivirgatus;
             return x;
         };
         return oconnelli;
-    })();
+    }());
     trivirgatus.oconnelli = oconnelli;
 })(trivirgatus || (trivirgatus = {}));
 var quasiater;
@@ -2299,7 +2299,7 @@ var quasiater;
             return x;
         };
         return bobrinskoi;
-    })();
+    }());
     quasiater.bobrinskoi = bobrinskoi;
 })(quasiater || (quasiater = {}));
 var ruatanica;
@@ -2334,7 +2334,7 @@ var ruatanica;
             return x;
         };
         return americanus;
-    })(imperfecta.ciliolabrum);
+    }(imperfecta.ciliolabrum));
     ruatanica.americanus = americanus;
 })(ruatanica || (ruatanica = {}));
 var lavali;
@@ -2423,13 +2423,13 @@ var lavali;
             return x;
         };
         return wilsoni;
-    })(Lanthanum.nitidus);
+    }(Lanthanum.nitidus));
     lavali.wilsoni = wilsoni;
     var beisa = (function () {
         function beisa() {
         }
         return beisa;
-    })();
+    }());
     lavali.beisa = beisa;
     var otion = (function (_super) {
         __extends(otion, _super);
@@ -2515,7 +2515,7 @@ var lavali;
             return x;
         };
         return otion;
-    })(howi.coludo);
+    }(howi.coludo));
     lavali.otion = otion;
     var xanthognathus = (function () {
         function xanthognathus() {
@@ -2593,7 +2593,7 @@ var lavali;
             return x;
         };
         return xanthognathus;
-    })();
+    }());
     lavali.xanthognathus = xanthognathus;
     var thaeleri = (function (_super) {
         __extends(thaeleri, _super);
@@ -2649,7 +2649,7 @@ var lavali;
             return x;
         };
         return thaeleri;
-    })(argurus.oreas);
+    }(argurus.oreas));
     lavali.thaeleri = thaeleri;
     var lepturus = (function (_super) {
         __extends(lepturus, _super);
@@ -2669,7 +2669,7 @@ var lavali;
             return x;
         };
         return lepturus;
-    })(Lanthanum.suillus);
+    }(Lanthanum.suillus));
     lavali.lepturus = lepturus;
 })(lavali || (lavali = {}));
 var dogramacii;
@@ -2734,7 +2734,7 @@ var dogramacii;
             return x;
         };
         return robustulus;
-    })(lavali.wilsoni);
+    }(lavali.wilsoni));
     dogramacii.robustulus = robustulus;
     var koepckeae = (function () {
         function koepckeae() {
@@ -2746,7 +2746,7 @@ var dogramacii;
             return x;
         };
         return koepckeae;
-    })();
+    }());
     dogramacii.koepckeae = koepckeae;
     var kaiseri = (function () {
         function kaiseri() {
@@ -2830,7 +2830,7 @@ var dogramacii;
             return x;
         };
         return kaiseri;
-    })();
+    }());
     dogramacii.kaiseri = kaiseri;
     var aurata = (function () {
         function aurata() {
@@ -2884,7 +2884,7 @@ var dogramacii;
             return x;
         };
         return aurata;
-    })();
+    }());
     dogramacii.aurata = aurata;
 })(dogramacii || (dogramacii = {}));
 var lutreolus;
@@ -2979,7 +2979,7 @@ var lutreolus;
             return x;
         };
         return schlegeli;
-    })(lavali.beisa);
+    }(lavali.beisa));
     lutreolus.schlegeli = schlegeli;
 })(lutreolus || (lutreolus = {}));
 var argurus;
@@ -3054,7 +3054,7 @@ var argurus;
             return x;
         };
         return dauricus;
-    })();
+    }());
     argurus.dauricus = dauricus;
 })(argurus || (argurus = {}));
 var nigra;
@@ -3111,7 +3111,7 @@ var nigra;
             return x;
         };
         return dolichurus;
-    })();
+    }());
     nigra.dolichurus = dolichurus;
 })(nigra || (nigra = {}));
 var panglima;
@@ -3158,7 +3158,7 @@ var panglima;
             return x;
         };
         return amphibius;
-    })(caurinus.johorensis);
+    }(caurinus.johorensis));
     panglima.amphibius = amphibius;
     var fundatus = (function (_super) {
         __extends(fundatus, _super);
@@ -3184,7 +3184,7 @@ var panglima;
             return x;
         };
         return fundatus;
-    })(lutreolus.schlegeli);
+    }(lutreolus.schlegeli));
     panglima.fundatus = fundatus;
     var abidi = (function (_super) {
         __extends(abidi, _super);
@@ -3222,7 +3222,7 @@ var panglima;
             return x;
         };
         return abidi;
-    })(argurus.dauricus);
+    }(argurus.dauricus));
     panglima.abidi = abidi;
 })(panglima || (panglima = {}));
 var quasiater;
@@ -3273,7 +3273,7 @@ var quasiater;
             return x;
         };
         return carolinensis;
-    })();
+    }());
     quasiater.carolinensis = carolinensis;
 })(quasiater || (quasiater = {}));
 var minutus;
@@ -3356,7 +3356,7 @@ var minutus;
             return x;
         };
         return himalayana;
-    })(lutreolus.punicus);
+    }(lutreolus.punicus));
     minutus.himalayana = himalayana;
 })(minutus || (minutus = {}));
 var caurinus;
@@ -3415,7 +3415,7 @@ var caurinus;
             return x;
         };
         return mahaganus;
-    })(panglima.fundatus);
+    }(panglima.fundatus));
     caurinus.mahaganus = mahaganus;
 })(caurinus || (caurinus = {}));
 var macrorhinos;
@@ -3430,7 +3430,7 @@ var macrorhinos;
             return x;
         };
         return marmosurus;
-    })();
+    }());
     macrorhinos.marmosurus = marmosurus;
 })(macrorhinos || (macrorhinos = {}));
 var howi;
@@ -3447,7 +3447,7 @@ var howi;
             return x;
         };
         return angulatus;
-    })(sagitta.stolzmanni);
+    }(sagitta.stolzmanni));
     howi.angulatus = angulatus;
 })(howi || (howi = {}));
 var daubentonii;
@@ -3456,7 +3456,7 @@ var daubentonii;
         function nesiotes() {
         }
         return nesiotes;
-    })();
+    }());
     daubentonii.nesiotes = nesiotes;
 })(daubentonii || (daubentonii = {}));
 var nigra;
@@ -3513,7 +3513,7 @@ var nigra;
             return x;
         };
         return thalia;
-    })();
+    }());
     nigra.thalia = thalia;
 })(nigra || (nigra = {}));
 var sagitta;
@@ -3530,7 +3530,7 @@ var sagitta;
             return x;
         };
         return walkeri;
-    })(minutus.portoricensis);
+    }(minutus.portoricensis));
     sagitta.walkeri = walkeri;
 })(sagitta || (sagitta = {}));
 var minutus;
@@ -3547,7 +3547,7 @@ var minutus;
             return x;
         };
         return inez;
-    })(samarensis.pelurus);
+    }(samarensis.pelurus));
     minutus.inez = inez;
 })(minutus || (minutus = {}));
 var macrorhinos;
@@ -3558,7 +3558,7 @@ var macrorhinos;
             _super.apply(this, arguments);
         }
         return konganensis;
-    })(imperfecta.lasiurus);
+    }(imperfecta.lasiurus));
     macrorhinos.konganensis = konganensis;
 })(macrorhinos || (macrorhinos = {}));
 var panamensis;
@@ -3623,7 +3623,7 @@ var panamensis;
             return x;
         };
         return linulus;
-    })(ruatanica.hector);
+    }(ruatanica.hector));
     panamensis.linulus = linulus;
 })(panamensis || (panamensis = {}));
 var nigra;
@@ -3710,7 +3710,7 @@ var nigra;
             return x;
         };
         return gracilis;
-    })();
+    }());
     nigra.gracilis = gracilis;
 })(nigra || (nigra = {}));
 var samarensis;
@@ -3799,7 +3799,7 @@ var samarensis;
             return x;
         };
         return pelurus;
-    })(sagitta.stolzmanni);
+    }(sagitta.stolzmanni));
     samarensis.pelurus = pelurus;
     var fuscus = (function (_super) {
         __extends(fuscus, _super);
@@ -3891,7 +3891,7 @@ var samarensis;
             return x;
         };
         return fuscus;
-    })(macrorhinos.daphaenodon);
+    }(macrorhinos.daphaenodon));
     samarensis.fuscus = fuscus;
     var pallidus = (function () {
         function pallidus() {
@@ -3921,7 +3921,7 @@ var samarensis;
             return x;
         };
         return pallidus;
-    })();
+    }());
     samarensis.pallidus = pallidus;
     var cahirinus = (function () {
         function cahirinus() {
@@ -3957,7 +3957,7 @@ var samarensis;
             return x;
         };
         return cahirinus;
-    })();
+    }());
     samarensis.cahirinus = cahirinus;
 })(samarensis || (samarensis = {}));
 var sagitta;
@@ -3998,7 +3998,7 @@ var sagitta;
             return x;
         };
         return leptoceros;
-    })(caurinus.johorensis);
+    }(caurinus.johorensis));
     sagitta.leptoceros = leptoceros;
 })(sagitta || (sagitta = {}));
 var daubentonii;
@@ -4015,7 +4015,7 @@ var daubentonii;
             return x;
         };
         return nigricans;
-    })(sagitta.stolzmanni);
+    }(sagitta.stolzmanni));
     daubentonii.nigricans = nigricans;
 })(daubentonii || (daubentonii = {}));
 var dammermani;
@@ -4024,7 +4024,7 @@ var dammermani;
         function siberu() {
         }
         return siberu;
-    })();
+    }());
     dammermani.siberu = siberu;
 })(dammermani || (dammermani = {}));
 var argurus;
@@ -4053,7 +4053,7 @@ var argurus;
             return x;
         };
         return pygmaea;
-    })(rendalli.moojeni);
+    }(rendalli.moojeni));
     argurus.pygmaea = pygmaea;
 })(argurus || (argurus = {}));
 var chrysaeolus;
@@ -4106,7 +4106,7 @@ var chrysaeolus;
             return x;
         };
         return sarasinorum;
-    })(caurinus.psilurus);
+    }(caurinus.psilurus));
     chrysaeolus.sarasinorum = sarasinorum;
 })(chrysaeolus || (chrysaeolus = {}));
 var argurus;
@@ -4157,7 +4157,7 @@ var argurus;
             return x;
         };
         return wetmorei;
-    })();
+    }());
     argurus.wetmorei = wetmorei;
 })(argurus || (argurus = {}));
 var argurus;
@@ -4216,7 +4216,7 @@ var argurus;
             return x;
         };
         return oreas;
-    })(lavali.wilsoni);
+    }(lavali.wilsoni));
     argurus.oreas = oreas;
 })(argurus || (argurus = {}));
 var daubentonii;
@@ -4297,7 +4297,7 @@ var daubentonii;
             return x;
         };
         return arboreus;
-    })();
+    }());
     daubentonii.arboreus = arboreus;
 })(daubentonii || (daubentonii = {}));
 var patas;
@@ -4384,7 +4384,7 @@ var patas;
             return x;
         };
         return uralensis;
-    })();
+    }());
     patas.uralensis = uralensis;
 })(patas || (patas = {}));
 var provocax;
@@ -4407,7 +4407,7 @@ var provocax;
             return x;
         };
         return melanoleuca;
-    })(lavali.wilsoni);
+    }(lavali.wilsoni));
     provocax.melanoleuca = melanoleuca;
 })(provocax || (provocax = {}));
 var sagitta;
@@ -4428,7 +4428,7 @@ var sagitta;
             return x;
         };
         return sicarius;
-    })();
+    }());
     sagitta.sicarius = sicarius;
 })(sagitta || (sagitta = {}));
 var howi;
@@ -4523,7 +4523,7 @@ var howi;
             return x;
         };
         return marcanoi;
-    })(Lanthanum.megalonyx);
+    }(Lanthanum.megalonyx));
     howi.marcanoi = marcanoi;
 })(howi || (howi = {}));
 var argurus;
@@ -4604,7 +4604,7 @@ var argurus;
             return x;
         };
         return gilbertii;
-    })();
+    }());
     argurus.gilbertii = gilbertii;
 })(argurus || (argurus = {}));
 var petrophilus;
@@ -4613,7 +4613,7 @@ var petrophilus;
         function minutilla() {
         }
         return minutilla;
-    })();
+    }());
     petrophilus.minutilla = minutilla;
 })(petrophilus || (petrophilus = {}));
 var lutreolus;
@@ -4700,7 +4700,7 @@ var lutreolus;
             return x;
         };
         return punicus;
-    })();
+    }());
     lutreolus.punicus = punicus;
 })(lutreolus || (lutreolus = {}));
 var macrorhinos;
@@ -4745,7 +4745,7 @@ var macrorhinos;
             return x;
         };
         return daphaenodon;
-    })();
+    }());
     macrorhinos.daphaenodon = daphaenodon;
 })(macrorhinos || (macrorhinos = {}));
 var sagitta;
@@ -4826,7 +4826,7 @@ var sagitta;
             return x;
         };
         return cinereus;
-    })();
+    }());
     sagitta.cinereus = cinereus;
 })(sagitta || (sagitta = {}));
 var nigra;
@@ -4835,7 +4835,7 @@ var nigra;
         function caucasica() {
         }
         return caucasica;
-    })();
+    }());
     nigra.caucasica = caucasica;
 })(nigra || (nigra = {}));
 var gabriellae;
@@ -4846,7 +4846,7 @@ var gabriellae;
             _super.apply(this, arguments);
         }
         return klossii;
-    })(imperfecta.lasiurus);
+    }(imperfecta.lasiurus));
     gabriellae.klossii = klossii;
     var amicus = (function () {
         function amicus() {
@@ -4912,7 +4912,7 @@ var gabriellae;
             return x;
         };
         return amicus;
-    })();
+    }());
     gabriellae.amicus = amicus;
     var echinatus = (function () {
         function echinatus() {
@@ -4924,7 +4924,7 @@ var gabriellae;
             return x;
         };
         return echinatus;
-    })();
+    }());
     gabriellae.echinatus = echinatus;
 })(gabriellae || (gabriellae = {}));
 var imperfecta;
@@ -4969,7 +4969,7 @@ var imperfecta;
             return x;
         };
         return lasiurus;
-    })();
+    }());
     imperfecta.lasiurus = lasiurus;
     var subspinosus = (function () {
         function subspinosus() {
@@ -5041,7 +5041,7 @@ var imperfecta;
             return x;
         };
         return subspinosus;
-    })();
+    }());
     imperfecta.subspinosus = subspinosus;
     var ciliolabrum = (function (_super) {
         __extends(ciliolabrum, _super);
@@ -5067,7 +5067,7 @@ var imperfecta;
             return x;
         };
         return ciliolabrum;
-    })(dogramacii.robustulus);
+    }(dogramacii.robustulus));
     imperfecta.ciliolabrum = ciliolabrum;
 })(imperfecta || (imperfecta = {}));
 var quasiater;
@@ -5100,7 +5100,7 @@ var quasiater;
             return x;
         };
         return wattsi;
-    })();
+    }());
     quasiater.wattsi = wattsi;
 })(quasiater || (quasiater = {}));
 var petrophilus;
@@ -5165,7 +5165,7 @@ var petrophilus;
             return x;
         };
         return sodyi;
-    })(quasiater.bobrinskoi);
+    }(quasiater.bobrinskoi));
     petrophilus.sodyi = sodyi;
 })(petrophilus || (petrophilus = {}));
 var caurinus;
@@ -5224,7 +5224,7 @@ var caurinus;
             return x;
         };
         return megaphyllus;
-    })(imperfecta.lasiurus);
+    }(imperfecta.lasiurus));
     caurinus.megaphyllus = megaphyllus;
 })(caurinus || (caurinus = {}));
 var minutus;
@@ -5251,7 +5251,7 @@ var minutus;
             return x;
         };
         return portoricensis;
-    })();
+    }());
     minutus.portoricensis = portoricensis;
 })(minutus || (minutus = {}));
 var lutreolus;
@@ -5338,7 +5338,7 @@ var lutreolus;
             return x;
         };
         return foina;
-    })();
+    }());
     lutreolus.foina = foina;
 })(lutreolus || (lutreolus = {}));
 var lutreolus;
@@ -5409,7 +5409,7 @@ var lutreolus;
             return x;
         };
         return cor;
-    })(panglima.fundatus);
+    }(panglima.fundatus));
     lutreolus.cor = cor;
 })(lutreolus || (lutreolus = {}));
 var howi;
@@ -5430,7 +5430,7 @@ var howi;
             return x;
         };
         return coludo;
-    })();
+    }());
     howi.coludo = coludo;
 })(howi || (howi = {}));
 var argurus;
@@ -5453,7 +5453,7 @@ var argurus;
             return x;
         };
         return germaini;
-    })(gabriellae.amicus);
+    }(gabriellae.amicus));
     argurus.germaini = germaini;
 })(argurus || (argurus = {}));
 var sagitta;
@@ -5528,7 +5528,7 @@ var sagitta;
             return x;
         };
         return stolzmanni;
-    })();
+    }());
     sagitta.stolzmanni = stolzmanni;
 })(sagitta || (sagitta = {}));
 var dammermani;
@@ -5617,7 +5617,7 @@ var dammermani;
             return x;
         };
         return melanops;
-    })(minutus.inez);
+    }(minutus.inez));
     dammermani.melanops = melanops;
 })(dammermani || (dammermani = {}));
 var argurus;
@@ -5676,7 +5676,7 @@ var argurus;
             return x;
         };
         return peninsulae;
-    })(patas.uralensis);
+    }(patas.uralensis));
     argurus.peninsulae = peninsulae;
 })(argurus || (argurus = {}));
 var argurus;
@@ -5763,7 +5763,7 @@ var argurus;
             return x;
         };
         return netscheri;
-    })();
+    }());
     argurus.netscheri = netscheri;
 })(argurus || (argurus = {}));
 var ruatanica;
@@ -5852,7 +5852,7 @@ var ruatanica;
             return x;
         };
         return Praseodymium;
-    })(ruatanica.hector);
+    }(ruatanica.hector));
     ruatanica.Praseodymium = Praseodymium;
 })(ruatanica || (ruatanica = {}));
 var caurinus;
@@ -5869,7 +5869,7 @@ var caurinus;
             return x;
         };
         return johorensis;
-    })(lutreolus.punicus);
+    }(lutreolus.punicus));
     caurinus.johorensis = johorensis;
 })(caurinus || (caurinus = {}));
 var argurus;
@@ -5884,7 +5884,7 @@ var argurus;
             return x;
         };
         return luctuosa;
-    })();
+    }());
     argurus.luctuosa = luctuosa;
 })(argurus || (argurus = {}));
 var panamensis;
@@ -5941,7 +5941,7 @@ var panamensis;
             return x;
         };
         return setulosus;
-    })();
+    }());
     panamensis.setulosus = setulosus;
 })(panamensis || (panamensis = {}));
 var petrophilus;
@@ -5980,7 +5980,7 @@ var petrophilus;
             return x;
         };
         return rosalia;
-    })();
+    }());
     petrophilus.rosalia = rosalia;
 })(petrophilus || (petrophilus = {}));
 var caurinus;
@@ -6027,7 +6027,7 @@ var caurinus;
             return x;
         };
         return psilurus;
-    })(lutreolus.punicus);
+    }(lutreolus.punicus));
     caurinus.psilurus = psilurus;
 })(caurinus || (caurinus = {}));
 
diff --git a/tests/baselines/reference/restParamModifier.js b/tests/baselines/reference/restParamModifier.js
index 9a780321dc987..3e0f7f7878a35 100644
--- a/tests/baselines/reference/restParamModifier.js
+++ b/tests/baselines/reference/restParamModifier.js
@@ -9,4 +9,4 @@ var C = (function () {
         if (string === void 0) { string = []; }
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/restParamModifier2.js b/tests/baselines/reference/restParamModifier2.js
index c588c945ce4b5..ac8376319b3c0 100644
--- a/tests/baselines/reference/restParamModifier2.js
+++ b/tests/baselines/reference/restParamModifier2.js
@@ -12,4 +12,4 @@ var C = (function () {
         }
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/restParameterAssignmentCompatibility.js b/tests/baselines/reference/restParameterAssignmentCompatibility.js
index 62c0204c74991..0821cf182771f 100644
--- a/tests/baselines/reference/restParameterAssignmentCompatibility.js
+++ b/tests/baselines/reference/restParameterAssignmentCompatibility.js
@@ -37,14 +37,14 @@ var T = (function () {
         }
     };
     return T;
-})();
+}());
 var S = (function () {
     function S() {
     }
     S.prototype.m = function (p1, p2) {
     };
     return S;
-})();
+}());
 var t;
 var s;
 // M is a non - specialized call or construct signature and S' contains a call or construct signature N where,
@@ -56,7 +56,7 @@ var T1 = (function () {
     T1.prototype.m = function (p1, p2) {
     };
     return T1;
-})();
+}());
 var t1;
 // When comparing call or construct signatures, parameter names are ignored and rest parameters correspond to an unbounded expansion of optional parameters of the rest parameter element type.
 t1 = s; // Similar to above, but optionality does not matter here.
diff --git a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
index c800c628c9ce3..26774b6c2f2be 100644
--- a/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
+++ b/tests/baselines/reference/restParameterWithoutAnnotationIsAnyArray.js
@@ -56,7 +56,7 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: function () {
diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes.js b/tests/baselines/reference/restParametersOfNonArrayTypes.js
index f6f6a8af44de0..d6235194b30b2 100644
--- a/tests/baselines/reference/restParametersOfNonArrayTypes.js
+++ b/tests/baselines/reference/restParametersOfNonArrayTypes.js
@@ -55,7 +55,7 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: function () {
diff --git a/tests/baselines/reference/restParametersOfNonArrayTypes2.js b/tests/baselines/reference/restParametersOfNonArrayTypes2.js
index 73d0ddaeef28f..598c8f2fe3d60 100644
--- a/tests/baselines/reference/restParametersOfNonArrayTypes2.js
+++ b/tests/baselines/reference/restParametersOfNonArrayTypes2.js
@@ -87,7 +87,7 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: function () {
@@ -137,7 +137,7 @@ var C2 = (function () {
         }
     };
     return C2;
-})();
+}());
 var a2;
 var b2 = {
     foo: function () {
diff --git a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
index c7d1dee929554..11208f1fb8346 100644
--- a/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
+++ b/tests/baselines/reference/restParametersWithArrayTypeAnnotations.js
@@ -82,7 +82,7 @@ var C = (function () {
         }
     };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: function () {
@@ -132,7 +132,7 @@ var C2 = (function () {
         }
     };
     return C2;
-})();
+}());
 var a2;
 var b2 = {
     foo: function () {
diff --git a/tests/baselines/reference/returnInConstructor1.js b/tests/baselines/reference/returnInConstructor1.js
index e8781f06d2424..fab0fe8fe0916 100644
--- a/tests/baselines/reference/returnInConstructor1.js
+++ b/tests/baselines/reference/returnInConstructor1.js
@@ -78,40 +78,40 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
         return 1; // error
     }
     B.prototype.foo = function () { };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
         return this;
     }
     C.prototype.foo = function () { };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
         return "test"; // error
     }
     D.prototype.foo = function () { };
     return D;
-})();
+}());
 var E = (function () {
     function E() {
         return { foo: 1 };
     }
     return E;
-})();
+}());
 var F = (function () {
     function F() {
         return { foo: 1 }; //error
     }
     return F;
-})();
+}());
 var G = (function () {
     function G() {
         this.test = 2;
@@ -119,7 +119,7 @@ var G = (function () {
     G.prototype.test1 = function () { };
     G.prototype.foo = function () { };
     return G;
-})();
+}());
 var H = (function (_super) {
     __extends(H, _super);
     function H() {
@@ -127,7 +127,7 @@ var H = (function (_super) {
         return new G(); //error
     }
     return H;
-})(F);
+}(F));
 var I = (function (_super) {
     __extends(I, _super);
     function I() {
@@ -135,4 +135,4 @@ var I = (function (_super) {
         return new G();
     }
     return I;
-})(G);
+}(G));
diff --git a/tests/baselines/reference/returnStatements.js b/tests/baselines/reference/returnStatements.js
index 956efc5f077df..a543ad3bddae7 100644
--- a/tests/baselines/reference/returnStatements.js
+++ b/tests/baselines/reference/returnStatements.js
@@ -44,14 +44,14 @@ var C = (function () {
     }
     C.prototype.dispose = function () { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 function fn10() { return { id: 12 }; }
 function fn11() { return new C(); }
 function fn12() { return new D(); }
diff --git a/tests/baselines/reference/returnTypeTypeArguments.js b/tests/baselines/reference/returnTypeTypeArguments.js
index b374cb1c58144..ade97159091fc 100644
--- a/tests/baselines/reference/returnTypeTypeArguments.js
+++ b/tests/baselines/reference/returnTypeTypeArguments.js
@@ -81,17 +81,17 @@ var One = (function () {
     function One() {
     }
     return One;
-})();
+}());
 var Two = (function () {
     function Two() {
     }
     return Two;
-})();
+}());
 var Three = (function () {
     function Three() {
     }
     return Three;
-})();
+}());
 function A1() { return null; }
 function A2() { return null; }
 function A3() { return null; }
@@ -108,7 +108,7 @@ var C = (function () {
     C.prototype.B2 = function () { return null; };
     C.prototype.B3 = function () { return null; };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -118,14 +118,14 @@ var D = (function () {
     D.prototype.B2 = function () { return null; };
     D.prototype.B3 = function () { return null; };
     return D;
-})();
+}());
 var Y = (function () {
     function Y() {
     }
     return Y;
-})();
+}());
 var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
diff --git a/tests/baselines/reference/returnValueInSetter.js b/tests/baselines/reference/returnValueInSetter.js
index 6774bab6c4e7d..86a52670ac534 100644
--- a/tests/baselines/reference/returnValueInSetter.js
+++ b/tests/baselines/reference/returnValueInSetter.js
@@ -19,4 +19,4 @@ var f = (function () {
         configurable: true
     });
     return f;
-})();
+}());
diff --git a/tests/baselines/reference/scannerClass2.js b/tests/baselines/reference/scannerClass2.js
index 0838df4d19f65..640f0952bb976 100644
--- a/tests/baselines/reference/scannerClass2.js
+++ b/tests/baselines/reference/scannerClass2.js
@@ -15,5 +15,5 @@ var LoggerAdapter = (function () {
         this._information = this.logger.information();
     }
     return LoggerAdapter;
-})();
+}());
 exports.LoggerAdapter = LoggerAdapter;
diff --git a/tests/baselines/reference/scannertest1.js b/tests/baselines/reference/scannertest1.js
index b96c965a79e31..2eb7115747624 100644
--- a/tests/baselines/reference/scannertest1.js
+++ b/tests/baselines/reference/scannertest1.js
@@ -46,4 +46,4 @@ var CharacterInfo = (function () {
                 : c - CharacterCodes.a + 10;
     };
     return CharacterInfo;
-})();
+}());
diff --git a/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js b/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
index 1a5fc7d9b3e20..3833a5caf7a82 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
@@ -18,7 +18,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -30,4 +30,4 @@ var D = (function (_super) {
         s = 1;
     };
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js b/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
index 2844897bdd9dd..d5de584e77958 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
@@ -18,7 +18,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -30,4 +30,4 @@ var D = (function (_super) {
         s = 1;
     };
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/scopeCheckInsidePublicMethod1.js b/tests/baselines/reference/scopeCheckInsidePublicMethod1.js
index b554cb1a0decc..46ee1fc719d93 100644
--- a/tests/baselines/reference/scopeCheckInsidePublicMethod1.js
+++ b/tests/baselines/reference/scopeCheckInsidePublicMethod1.js
@@ -14,4 +14,4 @@ var C = (function () {
         s = 1; // ERR
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/scopeCheckInsideStaticMethod1.js b/tests/baselines/reference/scopeCheckInsideStaticMethod1.js
index 0eb8349c74057..138c9daa483c2 100644
--- a/tests/baselines/reference/scopeCheckInsideStaticMethod1.js
+++ b/tests/baselines/reference/scopeCheckInsideStaticMethod1.js
@@ -20,4 +20,4 @@ var C = (function () {
         this.p = 1; // ERR
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.js b/tests/baselines/reference/scopeResolutionIdentifiers.js
index 42a1e68401593..ca45a95239ec5 100644
--- a/tests/baselines/reference/scopeResolutionIdentifiers.js
+++ b/tests/baselines/reference/scopeResolutionIdentifiers.js
@@ -66,7 +66,7 @@ var C = (function () {
         var p;
     };
     return C;
-})();
+}());
 var M3;
 (function (M3) {
     var s;
diff --git a/tests/baselines/reference/scopeTests.js b/tests/baselines/reference/scopeTests.js
index b104f63f74c29..833e84ee5f3ae 100644
--- a/tests/baselines/reference/scopeTests.js
+++ b/tests/baselines/reference/scopeTests.js
@@ -21,7 +21,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -31,4 +31,4 @@ var D = (function (_super) {
         C.s = 1;
     }
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/selfInCallback.js b/tests/baselines/reference/selfInCallback.js
index 25228b031878a..a0b363ae08154 100644
--- a/tests/baselines/reference/selfInCallback.js
+++ b/tests/baselines/reference/selfInCallback.js
@@ -18,4 +18,4 @@ var C = (function () {
         this.callback(function () { _this.p1 + 1; });
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/selfInLambdas.js b/tests/baselines/reference/selfInLambdas.js
index 6b09cf2e227af..b143c0c9e4ea3 100644
--- a/tests/baselines/reference/selfInLambdas.js
+++ b/tests/baselines/reference/selfInLambdas.js
@@ -73,4 +73,4 @@ var X = (function () {
         outer();
     };
     return X;
-})();
+}());
diff --git a/tests/baselines/reference/selfRef.js b/tests/baselines/reference/selfRef.js
index 171b1efa9779b..7f13e04cef18a 100644
--- a/tests/baselines/reference/selfRef.js
+++ b/tests/baselines/reference/selfRef.js
@@ -34,6 +34,6 @@ var M;
             };
         }
         return Test;
-    })();
+    }());
     M.Test = Test;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/selfReferencesInFunctionParameters.js b/tests/baselines/reference/selfReferencesInFunctionParameters.js
index c707fc0116b1c..5dd662cf16959 100644
--- a/tests/baselines/reference/selfReferencesInFunctionParameters.js
+++ b/tests/baselines/reference/selfReferencesInFunctionParameters.js
@@ -31,4 +31,4 @@ var C = (function () {
         if (b === void 0) { b = b.toString(); }
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/selfReferencingFile.js b/tests/baselines/reference/selfReferencingFile.js
index c77a6b8842942..82b706c55e621 100644
--- a/tests/baselines/reference/selfReferencingFile.js
+++ b/tests/baselines/reference/selfReferencingFile.js
@@ -11,4 +11,4 @@ var selfReferencingFile = (function () {
     function selfReferencingFile() {
     }
     return selfReferencingFile;
-})();
+}());
diff --git a/tests/baselines/reference/selfReferencingFile2.js b/tests/baselines/reference/selfReferencingFile2.js
index 57e67e2c51a1f..a14f9e1e87026 100644
--- a/tests/baselines/reference/selfReferencingFile2.js
+++ b/tests/baselines/reference/selfReferencingFile2.js
@@ -11,4 +11,4 @@ var selfReferencingFile2 = (function () {
     function selfReferencingFile2() {
     }
     return selfReferencingFile2;
-})();
+}());
diff --git a/tests/baselines/reference/selfReferencingFile3.js b/tests/baselines/reference/selfReferencingFile3.js
index 5dfee00e6b6f9..08db051ec1887 100644
--- a/tests/baselines/reference/selfReferencingFile3.js
+++ b/tests/baselines/reference/selfReferencingFile3.js
@@ -11,4 +11,4 @@ var selfReferencingFile3 = (function () {
     function selfReferencingFile3() {
     }
     return selfReferencingFile3;
-})();
+}());
diff --git a/tests/baselines/reference/setterBeforeGetter.js b/tests/baselines/reference/setterBeforeGetter.js
index c897198c2dd17..d5200a4eb4d3d 100644
--- a/tests/baselines/reference/setterBeforeGetter.js
+++ b/tests/baselines/reference/setterBeforeGetter.js
@@ -28,4 +28,4 @@ var Foo = (function () {
         configurable: true
     });
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/setterWithReturn.js b/tests/baselines/reference/setterWithReturn.js
index 995cde87509f2..b7fa5c67f8e0c 100644
--- a/tests/baselines/reference/setterWithReturn.js
+++ b/tests/baselines/reference/setterWithReturn.js
@@ -27,4 +27,4 @@ var C234 = (function () {
         configurable: true
     });
     return C234;
-})();
+}());
diff --git a/tests/baselines/reference/shadowPrivateMembers.js b/tests/baselines/reference/shadowPrivateMembers.js
index e2ac679e7eb48..a1474a24777c1 100644
--- a/tests/baselines/reference/shadowPrivateMembers.js
+++ b/tests/baselines/reference/shadowPrivateMembers.js
@@ -14,7 +14,7 @@ var base = (function () {
     }
     base.prototype.n = function () { };
     return base;
-})();
+}());
 var derived = (function (_super) {
     __extends(derived, _super);
     function derived() {
@@ -22,4 +22,4 @@ var derived = (function (_super) {
     }
     derived.prototype.n = function () { };
     return derived;
-})(base);
+}(base));
diff --git a/tests/baselines/reference/shadowedInternalModule.js b/tests/baselines/reference/shadowedInternalModule.js
index 3a7c6d4d61ade..d2566976092ef 100644
--- a/tests/baselines/reference/shadowedInternalModule.js
+++ b/tests/baselines/reference/shadowedInternalModule.js
@@ -49,7 +49,7 @@ var X;
         function Y() {
         }
         return Y;
-    })();
+    }());
     X.Y = Y;
 })(X || (X = {}));
 var Z;
diff --git a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js
index 3d718e84e9533..39b67f9026d94 100644
--- a/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js
+++ b/tests/baselines/reference/sigantureIsSubTypeIfTheyAreIdentical.js
@@ -16,4 +16,4 @@ var CacheService = (function () {
         return undefined;
     };
     return CacheService;
-})();
+}());
diff --git a/tests/baselines/reference/sourceMap-Comments.js b/tests/baselines/reference/sourceMap-Comments.js
index 12a4e5010ddb6..e8177d5752c06 100644
--- a/tests/baselines/reference/sourceMap-Comments.js
+++ b/tests/baselines/reference/sourceMap-Comments.js
@@ -43,7 +43,7 @@ var sas;
                 }
             };
             return Test;
-        })();
+        }());
         tools.Test = Test;
     })(tools = sas.tools || (sas.tools = {}));
 })(sas || (sas = {}));
diff --git a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt
index ed6b510ac9416..29726c68d9ae5 100644
--- a/tests/baselines/reference/sourceMap-Comments.sourcemap.txt
+++ b/tests/baselines/reference/sourceMap-Comments.sourcemap.txt
@@ -332,7 +332,7 @@ sourceFile:sourceMap-Comments.ts
 1->Emitted(22, 13) Source(17, 5) + SourceIndex(0)
 2 >Emitted(22, 24) Source(17, 6) + SourceIndex(0)
 ---
->>>        })();
+>>>        }());
 1 >^^^^^^^^
 2 >        ^
 3 >         
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.js b/tests/baselines/reference/sourceMap-FileWithComments.js
index e9755f6c04805..9bb18dba33d5f 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.js
+++ b/tests/baselines/reference/sourceMap-FileWithComments.js
@@ -52,7 +52,7 @@ var Shapes;
         // Static member
         Point.origin = new Point(0, 0);
         return Point;
-    })();
+    }());
     Shapes.Point = Point;
     // Variable comment after class
     var a = 10;
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
index c3909571fdddc..3bcf26345079d 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
+++ b/tests/baselines/reference/sourceMap-FileWithComments.sourcemap.txt
@@ -327,7 +327,7 @@ sourceFile:sourceMap-FileWithComments.ts
 1 >Emitted(15, 9) Source(20, 5) + SourceIndex(0)
 2 >Emitted(15, 21) Source(20, 6) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/sourceMapSample.js b/tests/baselines/reference/sourceMapSample.js
index 96c78c94c0cd2..4b710b89234cf 100644
--- a/tests/baselines/reference/sourceMapSample.js
+++ b/tests/baselines/reference/sourceMapSample.js
@@ -49,7 +49,7 @@ var Foo;
                 return "<h1>" + this.greeting + "</h1>";
             };
             return Greeter;
-        })();
+        }());
         function foo(greeting) {
             return new Greeter(greeting);
         }
diff --git a/tests/baselines/reference/sourceMapSample.sourcemap.txt b/tests/baselines/reference/sourceMapSample.sourcemap.txt
index 8ea198b312949..0fb03dacf48e9 100644
--- a/tests/baselines/reference/sourceMapSample.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapSample.sourcemap.txt
@@ -265,7 +265,7 @@ sourceFile:sourceMapSample.ts
 1->Emitted(13, 13) Source(11, 5) + SourceIndex(0)
 2 >Emitted(13, 27) Source(11, 6) + SourceIndex(0)
 ---
->>>        })();
+>>>        }());
 1 >^^^^^^^^
 2 >        ^
 3 >         
diff --git a/tests/baselines/reference/sourceMapValidationClass.js b/tests/baselines/reference/sourceMapValidationClass.js
index eef5a723ebf3e..f0ddca123f9b6 100644
--- a/tests/baselines/reference/sourceMapValidationClass.js
+++ b/tests/baselines/reference/sourceMapValidationClass.js
@@ -45,5 +45,5 @@ var Greeter = (function () {
         configurable: true
     });
     return Greeter;
-})();
+}());
 //# sourceMappingURL=sourceMapValidationClass.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
index 3b726492c8fd4..4173ae0ff0d91 100644
--- a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
@@ -340,7 +340,7 @@ sourceFile:sourceMapValidationClass.ts
 1->Emitted(26, 5) Source(18, 1) + SourceIndex(0)
 2 >Emitted(26, 19) Source(18, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js
index 149780baf087d..f76b44fdcd854 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.js
@@ -11,5 +11,5 @@ var Greeter = (function () {
         this.nameA = "Ten";
     }
     return Greeter;
-})();
+}());
 //# sourceMappingURL=sourceMapValidationClassWithDefaultConstructor.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt
index f07dbf92120e2..ad4b2800796e1 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructor.sourcemap.txt
@@ -75,7 +75,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructor.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 19) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js
index 486cdd3963747..ad92aa18eaec5 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js
@@ -12,5 +12,5 @@ var Greeter = (function () {
         this.returnA = function () { return _this.a; };
     }
     return Greeter;
-})();
+}());
 //# sourceMappingURL=sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt
index fb58003ddcf2b..d5cb74636e7d3 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatement.sourcemap.txt
@@ -103,7 +103,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndCapturedThisStatemen
 1->Emitted(7, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 19) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
index f210e65d4d26c..1d852127963ae 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
@@ -17,7 +17,7 @@ var AbstractGreeter = (function () {
     function AbstractGreeter() {
     }
     return AbstractGreeter;
-})();
+}());
 var Greeter = (function (_super) {
     __extends(Greeter, _super);
     function Greeter() {
@@ -26,5 +26,5 @@ var Greeter = (function (_super) {
         this.nameA = "Ten";
     }
     return Greeter;
-})(AbstractGreeter);
+}(AbstractGreeter));
 //# sourceMappingURL=sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
index cf0a189bef355..7dd53ed4b6238 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
@@ -1,2 +1,2 @@
 //// [sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map]
-{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts"],"names":[],"mappings":";;;;;AAAA;IAAA;IACA,CAAC;IAAD,sBAAC;AAAD,CAAC,AADD,IACC;AAED;IAAsB,2BAAe;IAArC;QAAsB,8BAAe;QAC1B,MAAC,GAAG,EAAE,CAAC;QACP,UAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,EAAsB,eAAe,EAGpC"}
\ No newline at end of file
+{"version":3,"file":"sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js","sourceRoot":"","sources":["sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts"],"names":[],"mappings":";;;;;AAAA;IAAA;IACA,CAAC;IAAD,sBAAC;AAAD,CAAC,AADD,IACC;AAED;IAAsB,2BAAe;IAArC;QAAsB,8BAAe;QAC1B,MAAC,GAAG,EAAE,CAAC;QACP,UAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,CAAsB,eAAe,GAGpC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
index 86bbba306ff61..5a3b2f86be9ed 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
@@ -43,7 +43,7 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1->Emitted(9, 5) Source(2, 1) + SourceIndex(0)
 2 >Emitted(9, 27) Source(2, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -145,28 +145,28 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1->Emitted(18, 5) Source(7, 1) + SourceIndex(0)
 2 >Emitted(18, 19) Source(7, 2) + SourceIndex(0)
 ---
->>>})(AbstractGreeter);
+>>>}(AbstractGreeter));
 1->
 2 >^
 3 > 
-4 > ^^
-5 >   ^^^^^^^^^^^^^^^
-6 >                  ^^
+4 > ^
+5 >  ^^^^^^^^^^^^^^^
+6 >                 ^^^
 7 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >}
 3 > 
 4 > class Greeter extends 
-5 >   AbstractGreeter
-6 >                   {
-  >                      public a = 10;
-  >                      public nameA = "Ten";
-  >                  }
+5 >  AbstractGreeter
+6 >                  {
+  >                     public a = 10;
+  >                     public nameA = "Ten";
+  >                 }
 1->Emitted(19, 1) Source(7, 1) + SourceIndex(0)
 2 >Emitted(19, 2) Source(7, 2) + SourceIndex(0)
 3 >Emitted(19, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(19, 4) Source(4, 23) + SourceIndex(0)
-5 >Emitted(19, 19) Source(4, 38) + SourceIndex(0)
+4 >Emitted(19, 3) Source(4, 23) + SourceIndex(0)
+5 >Emitted(19, 18) Source(4, 38) + SourceIndex(0)
 6 >Emitted(19, 21) Source(7, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClasses.js b/tests/baselines/reference/sourceMapValidationClasses.js
index e3b705bc4b025..661892bc74853 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.js
+++ b/tests/baselines/reference/sourceMapValidationClasses.js
@@ -50,7 +50,7 @@ var Foo;
                 return "<h1>" + this.greeting + "</h1>";
             };
             return Greeter;
-        })();
+        }());
         function foo(greeting) {
             return new Greeter(greeting);
         }
diff --git a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
index bbf9aa3eb2ea3..4501ec5d872dc 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt
@@ -267,7 +267,7 @@ sourceFile:sourceMapValidationClasses.ts
 1->Emitted(13, 13) Source(11, 5) + SourceIndex(0)
 2 >Emitted(13, 27) Source(11, 6) + SourceIndex(0)
 ---
->>>        })();
+>>>        }());
 1 >^^^^^^^^
 2 >        ^
 3 >         
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js b/tests/baselines/reference/sourceMapValidationDecorators.js
index 04eb1d71078ae..c3bb5cd722526 100644
--- a/tests/baselines/reference/sourceMapValidationDecorators.js
+++ b/tests/baselines/reference/sourceMapValidationDecorators.js
@@ -120,5 +120,5 @@ var Greeter = (function () {
         __param(1, ParameterDecorator2(30))
     ], Greeter);
     return Greeter;
-})();
+}());
 //# sourceMappingURL=sourceMapValidationDecorators.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
index 418fee1f87f9f..168204288569d 100644
--- a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
@@ -776,7 +776,7 @@ sourceFile:sourceMapValidationDecorators.ts
 1->Emitted(65, 5) Source(54, 1) + SourceIndex(0)
 2 >Emitted(65, 19) Source(54, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.js b/tests/baselines/reference/sourceMapValidationExportAssignment.js
index 635692ef81af0..f556ec0cb8197 100644
--- a/tests/baselines/reference/sourceMapValidationExportAssignment.js
+++ b/tests/baselines/reference/sourceMapValidationExportAssignment.js
@@ -11,7 +11,7 @@ define(["require", "exports"], function (require, exports) {
         function a() {
         }
         return a;
-    })();
+    }());
     return a;
 });
 //# sourceMappingURL=sourceMapValidationExportAssignment.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt
index 2f30a6d1e104b..cdb318d1e15d1 100644
--- a/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationExportAssignment.sourcemap.txt
@@ -41,7 +41,7 @@ sourceFile:sourceMapValidationExportAssignment.ts
 1->Emitted(6, 9) Source(3, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(3, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js
index daa9391533f68..b524a09107b85 100644
--- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js
+++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js
@@ -10,6 +10,6 @@ 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.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt
index a25277da7b199..ed6cf368d964e 100644
--- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt
@@ -40,7 +40,7 @@ sourceFile:sourceMapValidationExportAssignmentCommonjs.ts
 1->Emitted(5, 5) Source(3, 1) + SourceIndex(0)
 2 >Emitted(5, 13) Source(3, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/sourceMapValidationImport.js b/tests/baselines/reference/sourceMapValidationImport.js
index 5f829c4ba13d9..d9a75d968488e 100644
--- a/tests/baselines/reference/sourceMapValidationImport.js
+++ b/tests/baselines/reference/sourceMapValidationImport.js
@@ -16,7 +16,7 @@ var m;
         function c() {
         }
         return c;
-    })();
+    }());
     m.c = c;
 })(m = exports.m || (exports.m = {}));
 var a = m.c;
diff --git a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
index 43eb1963a91c2..ca0ae80c5fcb7 100644
--- a/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationImport.sourcemap.txt
@@ -76,7 +76,7 @@ sourceFile:sourceMapValidationImport.ts
 1->Emitted(7, 9) Source(3, 5) + SourceIndex(0)
 2 >Emitted(7, 17) Source(3, 6) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/sourceMapValidationWithComments.js b/tests/baselines/reference/sourceMapValidationWithComments.js
index 53577271b779d..653dcf3c90c35 100644
--- a/tests/baselines/reference/sourceMapValidationWithComments.js
+++ b/tests/baselines/reference/sourceMapValidationWithComments.js
@@ -41,5 +41,5 @@ var DebugClass = (function () {
         return true;
     };
     return DebugClass;
-})();
+}());
 //# sourceMappingURL=sourceMapValidationWithComments.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt b/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt
index 77a63842cc47c..89d60b87c7db8 100644
--- a/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationWithComments.sourcemap.txt
@@ -284,7 +284,7 @@ sourceFile:sourceMapValidationWithComments.ts
 1->Emitted(19, 5) Source(21, 1) + SourceIndex(0)
 2 >Emitted(19, 22) Source(21, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js
index 37ef08d97fbc0..a41eea9cb281d 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js
@@ -17,10 +17,10 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 //# sourceMappingURL=fooResult.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt
index a83b5f4bb9c9b..fa1ae2e722180 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.sourcemap.txt
@@ -57,7 +57,7 @@ sourceFile:../testFiles/app.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -107,7 +107,7 @@ sourceFile:../testFiles/app2.ts
 1->Emitted(11, 5) Source(2, 1) + SourceIndex(1)
 2 >Emitted(11, 13) Source(2, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js
index 148a66f15dbb2..3872068e7c29c 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.js
@@ -17,11 +17,11 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 //# sourceMappingURL=app.js.map//// [app2.js]
 var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 //# sourceMappingURL=app2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt
index e02fb678ae288..bea8c2c6a9dbc 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNamesAndOutDir.sourcemap.txt
@@ -57,7 +57,7 @@ sourceFile:../testFiles/app.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -113,7 +113,7 @@ sourceFile:../testFiles/app2.ts
 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
index 81f627ebedc67..7e891c5765623 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
@@ -28,7 +28,7 @@ var m1;
         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.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
index 7ad34d2976110..e0f2a3cbbba98 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
@@ -158,7 +158,7 @@ sourceFile:tests/cases/compiler/b.ts
 1->Emitted(10, 9) Source(3, 5) + SourceIndex(1)
 2 >Emitted(10, 18) Source(3, 6) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js
index 50a3a2f3bc85f..b1da77bdb6760 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js
@@ -17,10 +17,10 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 //# sourceMappingURL=fooResult.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt
index 28b2e240b8b7f..25b3d6cfeaf53 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.sourcemap.txt
@@ -57,7 +57,7 @@ sourceFile:app.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -107,7 +107,7 @@ sourceFile:app2.ts
 1->Emitted(11, 5) Source(2, 1) + SourceIndex(1)
 2 >Emitted(11, 13) Source(2, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js
index 4dc043e0ce728..0abd131f0f99c 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.js
@@ -17,11 +17,11 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 //# sourceMappingURL=app.js.map//// [app2.js]
 var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 //# sourceMappingURL=app2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt
index af6ed80a85bf3..7b4b590fad6c6 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNamesAndOutDir.sourcemap.txt
@@ -57,7 +57,7 @@ sourceFile:app.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 13) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -113,7 +113,7 @@ sourceFile:app2.ts
 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.js b/tests/baselines/reference/sourcemapValidationDuplicateNames.js
index 5fe519acc5b87..360635fe74d99 100644
--- a/tests/baselines/reference/sourcemapValidationDuplicateNames.js
+++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.js
@@ -16,7 +16,7 @@ var m1;
         function c() {
         }
         return c;
-    })();
+    }());
     m1.c = c;
 })(m1 || (m1 = {}));
 var m1;
diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt
index 50302c30a22dc..5e67d69a51788 100644
--- a/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt
+++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.sourcemap.txt
@@ -97,7 +97,7 @@ sourceFile:sourcemapValidationDuplicateNames.ts
 1->Emitted(7, 9) Source(4, 5) + SourceIndex(0)
 2 >Emitted(7, 17) Source(4, 6) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/specializationOfExportedClass.js b/tests/baselines/reference/specializationOfExportedClass.js
index 75ec00b73042a..da39b6eca19bd 100644
--- a/tests/baselines/reference/specializationOfExportedClass.js
+++ b/tests/baselines/reference/specializationOfExportedClass.js
@@ -15,7 +15,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
 var x = new M.C();
diff --git a/tests/baselines/reference/specializedInheritedConstructors1.js b/tests/baselines/reference/specializedInheritedConstructors1.js
index 20ef13c3f0904..f521ba14838b6 100644
--- a/tests/baselines/reference/specializedInheritedConstructors1.js
+++ b/tests/baselines/reference/specializedInheritedConstructors1.js
@@ -27,19 +27,19 @@ var View = (function () {
     function View(options) {
     }
     return View;
-})();
+}());
 var Model = (function () {
     function Model() {
     }
     return Model;
-})();
+}());
 var MyView = (function (_super) {
     __extends(MyView, _super);
     function MyView() {
         _super.apply(this, arguments);
     }
     return MyView;
-})(View);
+}(View));
 var m = { model: new Model() };
 var aView = new View({ model: new Model() });
 var aView2 = new View(m);
diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.js b/tests/baselines/reference/specializedLambdaTypeArguments.js
index 393b4f9e8c355..9e5e6778659d3 100644
--- a/tests/baselines/reference/specializedLambdaTypeArguments.js
+++ b/tests/baselines/reference/specializedLambdaTypeArguments.js
@@ -11,5 +11,5 @@ var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 var a;
diff --git a/tests/baselines/reference/specializedOverloadWithRestParameters.js b/tests/baselines/reference/specializedOverloadWithRestParameters.js
index 31cb4a69594dd..62688f7cb7ef3 100644
--- a/tests/baselines/reference/specializedOverloadWithRestParameters.js
+++ b/tests/baselines/reference/specializedOverloadWithRestParameters.js
@@ -23,7 +23,7 @@ var Base = (function () {
     }
     Base.prototype.foo = function () { };
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
@@ -31,7 +31,7 @@ var Derived1 = (function (_super) {
     }
     Derived1.prototype.bar = function () { };
     return Derived1;
-})(Base);
+}(Base));
 function f(tagName) {
     return null;
 }
diff --git a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js
index e5e06d48a8de8..f2946cbeab8e8 100644
--- a/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js
+++ b/tests/baselines/reference/specializedSignatureIsNotSubtypeOfNonSpecializedSignature.js
@@ -75,19 +75,19 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { };
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     C2.prototype.foo = function (x) { };
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     C3.prototype.foo = function (x) { };
     return C3;
-})();
+}());
 var a;
 var a2;
 var a3;
diff --git a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js
index 17a886a078465..f4e7961226a2b 100644
--- a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js
+++ b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.js
@@ -90,19 +90,19 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { };
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     C2.prototype.foo = function (x) { };
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     C3.prototype.foo = function (x) { };
     return C3;
-})();
+}());
 var a;
 var a2;
 var a3;
diff --git a/tests/baselines/reference/staticAndMemberFunctions.js b/tests/baselines/reference/staticAndMemberFunctions.js
index 71f146b72f7a0..ddf47b941d46e 100644
--- a/tests/baselines/reference/staticAndMemberFunctions.js
+++ b/tests/baselines/reference/staticAndMemberFunctions.js
@@ -11,4 +11,4 @@ var T = (function () {
     T.x = function () { };
     T.prototype.y = function () { };
     return T;
-})();
+}());
diff --git a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.js b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.js
index be667ae1f3b33..a5c7c5245e927 100644
--- a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.js
+++ b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.js
@@ -14,4 +14,4 @@ var C = (function () {
     C.prototype.f = function () { };
     C.f = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticAsIdentifier.js b/tests/baselines/reference/staticAsIdentifier.js
index 36e317b287541..e7751dfca96fe 100644
--- a/tests/baselines/reference/staticAsIdentifier.js
+++ b/tests/baselines/reference/staticAsIdentifier.js
@@ -9,4 +9,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticClassMemberError.js b/tests/baselines/reference/staticClassMemberError.js
index e33cf2f270432..62166aef8337e 100644
--- a/tests/baselines/reference/staticClassMemberError.js
+++ b/tests/baselines/reference/staticClassMemberError.js
@@ -20,9 +20,9 @@ var C = (function () {
         s = 1;
     };
     return C;
-})();
+}());
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/staticClassProps.js b/tests/baselines/reference/staticClassProps.js
index aad40e29b76f1..c808e4eb7fd81 100644
--- a/tests/baselines/reference/staticClassProps.js
+++ b/tests/baselines/reference/staticClassProps.js
@@ -15,4 +15,4 @@ var C = (function () {
     C.prototype.foo = function () { };
     C.z = 1;
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticFactory1.js b/tests/baselines/reference/staticFactory1.js
index 03092a16de9b8..6ccd30e37d15a 100644
--- a/tests/baselines/reference/staticFactory1.js
+++ b/tests/baselines/reference/staticFactory1.js
@@ -27,7 +27,7 @@ var Base = (function () {
         return new this();
     };
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -35,6 +35,6 @@ var Derived = (function (_super) {
     }
     Derived.prototype.foo = function () { return 2; };
     return Derived;
-})(Base);
+}(Base));
 var d = Derived.create();
 d.foo();
diff --git a/tests/baselines/reference/staticGetter1.js b/tests/baselines/reference/staticGetter1.js
index 3772364804ab7..bffc1e03da048 100644
--- a/tests/baselines/reference/staticGetter1.js
+++ b/tests/baselines/reference/staticGetter1.js
@@ -20,4 +20,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticGetter2.js b/tests/baselines/reference/staticGetter2.js
index 419ea7bbedf2b..0f59f434be6ce 100644
--- a/tests/baselines/reference/staticGetter2.js
+++ b/tests/baselines/reference/staticGetter2.js
@@ -17,4 +17,4 @@ var C = (function () {
         return this;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticGetterAndSetter.js b/tests/baselines/reference/staticGetterAndSetter.js
index 5c61af0b7cc10..3ae3dfc7d1e87 100644
--- a/tests/baselines/reference/staticGetterAndSetter.js
+++ b/tests/baselines/reference/staticGetterAndSetter.js
@@ -16,4 +16,4 @@ var Foo = (function () {
         configurable: true
     });
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/staticIndexer.js b/tests/baselines/reference/staticIndexer.js
index f945cf686b036..1be0be2c8da14 100644
--- a/tests/baselines/reference/staticIndexer.js
+++ b/tests/baselines/reference/staticIndexer.js
@@ -8,4 +8,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticIndexers.js b/tests/baselines/reference/staticIndexers.js
index 4c8a0bc1ec80b..610e805a3c11b 100644
--- a/tests/baselines/reference/staticIndexers.js
+++ b/tests/baselines/reference/staticIndexers.js
@@ -19,14 +19,14 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/staticInheritance.js b/tests/baselines/reference/staticInheritance.js
index d3e14d482cc2c..52868930792a8 100644
--- a/tests/baselines/reference/staticInheritance.js
+++ b/tests/baselines/reference/staticInheritance.js
@@ -23,7 +23,7 @@ var A = (function () {
         this.p = doThing(A); // OK
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -32,5 +32,5 @@ var B = (function (_super) {
         this.p2 = doThing(B); // OK
     }
     return B;
-})(A);
+}(A));
 doThing(B); //OK
diff --git a/tests/baselines/reference/staticInstanceResolution.js b/tests/baselines/reference/staticInstanceResolution.js
index de4e9bc9f0ad1..788a8634c2eb4 100644
--- a/tests/baselines/reference/staticInstanceResolution.js
+++ b/tests/baselines/reference/staticInstanceResolution.js
@@ -26,4 +26,4 @@ var Comment = (function () {
         c.getDocCommentText();
     };
     return Comment;
-})();
+}());
diff --git a/tests/baselines/reference/staticInstanceResolution2.js b/tests/baselines/reference/staticInstanceResolution2.js
index 07d5dd376df85..3bfb52c6b65f3 100644
--- a/tests/baselines/reference/staticInstanceResolution2.js
+++ b/tests/baselines/reference/staticInstanceResolution2.js
@@ -16,11 +16,11 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 A.hasOwnProperty('foo');
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 B.hasOwnProperty('foo');
diff --git a/tests/baselines/reference/staticInstanceResolution3.js b/tests/baselines/reference/staticInstanceResolution3.js
index 265d3e5b3e608..238d1bdad13c8 100644
--- a/tests/baselines/reference/staticInstanceResolution3.js
+++ b/tests/baselines/reference/staticInstanceResolution3.js
@@ -21,7 +21,7 @@ var Promise = (function () {
         return null;
     };
     return Promise;
-})();
+}());
 exports.Promise = Promise;
 //// [staticInstanceResolution3_1.js]
 "use strict";
diff --git a/tests/baselines/reference/staticInstanceResolution4.js b/tests/baselines/reference/staticInstanceResolution4.js
index c74030d047ecd..ab98d9deb8e08 100644
--- a/tests/baselines/reference/staticInstanceResolution4.js
+++ b/tests/baselines/reference/staticInstanceResolution4.js
@@ -11,5 +11,5 @@ var A = (function () {
     }
     A.prototype.foo = function () { };
     return A;
-})();
+}());
 A.foo();
diff --git a/tests/baselines/reference/staticInterfaceAssignmentCompat.js b/tests/baselines/reference/staticInterfaceAssignmentCompat.js
index b955474eb574e..1368ffc2f73c6 100644
--- a/tests/baselines/reference/staticInterfaceAssignmentCompat.js
+++ b/tests/baselines/reference/staticInterfaceAssignmentCompat.js
@@ -20,5 +20,5 @@ var Shape = (function () {
         return new Shape();
     };
     return Shape;
-})();
+}());
 var x = Shape;
diff --git a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
index 8f9849af057fe..a05ece1dbbbcc 100644
--- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
+++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
@@ -22,7 +22,7 @@ var SomeBase = (function () {
         return 2;
     };
     return SomeBase;
-})();
+}());
 var P = (function (_super) {
     __extends(P, _super);
     function P() {
@@ -30,4 +30,4 @@ var P = (function (_super) {
     }
     P.SomeNumber = P.GetNumber();
     return P;
-})(SomeBase);
+}(SomeBase));
diff --git a/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js b/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js
index edd657d7da1f0..9f34914460c44 100644
--- a/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js
+++ b/tests/baselines/reference/staticMemberAssignsToConstructorFunctionMembers.js
@@ -26,4 +26,4 @@ var C = (function () {
         return 1;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticMemberExportAccess.js b/tests/baselines/reference/staticMemberExportAccess.js
index 3779935670805..58fddf445ee2b 100644
--- a/tests/baselines/reference/staticMemberExportAccess.js
+++ b/tests/baselines/reference/staticMemberExportAccess.js
@@ -29,7 +29,7 @@ var Sammy = (function () {
         return -1;
     };
     return Sammy;
-})();
+}());
 var Sammy;
 (function (Sammy) {
     Sammy.x = 1;
diff --git a/tests/baselines/reference/staticMemberInitialization.js b/tests/baselines/reference/staticMemberInitialization.js
index 1e919b4f99399..c21c29ed4f815 100644
--- a/tests/baselines/reference/staticMemberInitialization.js
+++ b/tests/baselines/reference/staticMemberInitialization.js
@@ -12,6 +12,6 @@ var C = (function () {
     }
     C.x = 1;
     return C;
-})();
+}());
 var c = new C();
 var r = C.x;
diff --git a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js
index 7b24a29b326a3..1b98daa226dfa 100644
--- a/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js
+++ b/tests/baselines/reference/staticMemberOfClassAndPublicMemberOfAnotherClassAssignment.js
@@ -31,13 +31,13 @@ var B = (function () {
     }
     B.prototype.name = function () { };
     return B;
-})();
+}());
 var C = (function () {
     function C() {
     }
     C.name = function () { };
     return C;
-})();
+}());
 var a = new B();
 a = new C(); // error name is missing
 a = B; // error name is missing
diff --git a/tests/baselines/reference/staticMemberWithStringAndNumberNames.js b/tests/baselines/reference/staticMemberWithStringAndNumberNames.js
index 2f48aba4f950e..2fdd64ea04b76 100644
--- a/tests/baselines/reference/staticMemberWithStringAndNumberNames.js
+++ b/tests/baselines/reference/staticMemberWithStringAndNumberNames.js
@@ -25,4 +25,4 @@ var C = (function () {
     C.s2 = C['0'];
     C.s3 = C[0];
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticMembersUsingClassTypeParameter.js b/tests/baselines/reference/staticMembersUsingClassTypeParameter.js
index 0c728cdbab698..c7355c01270f0 100644
--- a/tests/baselines/reference/staticMembersUsingClassTypeParameter.js
+++ b/tests/baselines/reference/staticMembersUsingClassTypeParameter.js
@@ -22,16 +22,16 @@ var C = (function () {
     }
     C.f = function (x) { };
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     C2.f = function (x) { };
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     C3.f = function (x) { };
     return C3;
-})();
+}());
diff --git a/tests/baselines/reference/staticMethodReferencingTypeArgument1.js b/tests/baselines/reference/staticMethodReferencingTypeArgument1.js
index 00ba0f140027a..d4815aee2b651 100644
--- a/tests/baselines/reference/staticMethodReferencingTypeArgument1.js
+++ b/tests/baselines/reference/staticMethodReferencingTypeArgument1.js
@@ -31,6 +31,6 @@ var Editor;
             return entry;
         };
         return List;
-    })();
+    }());
     Editor.List = List;
 })(Editor || (Editor = {}));
diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
index 3a14dde64478d..9b8987659c5fc 100644
--- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
@@ -27,12 +27,12 @@ var privateClass = (function () {
     function privateClass() {
     }
     return privateClass;
-})();
+}());
 var publicClass = (function () {
     function publicClass() {
     }
     return publicClass;
-})();
+}());
 exports.publicClass = publicClass;
 var publicClassWithWithPrivateTypeParameters = (function () {
     function publicClassWithWithPrivateTypeParameters() {
@@ -50,7 +50,7 @@ var publicClassWithWithPrivateTypeParameters = (function () {
     publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
     };
     return publicClassWithWithPrivateTypeParameters;
-})();
+}());
 exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
 
 
diff --git a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js
index 76fa7d6249e7b..43c9ac9da0371 100644
--- a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js
+++ b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.js
@@ -9,4 +9,4 @@ var C = (function () {
     }
     C.s = function (p) { return p; };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticModifierAlreadySeen.js b/tests/baselines/reference/staticModifierAlreadySeen.js
index d767a9b51d1c7..76f8b050d6f39 100644
--- a/tests/baselines/reference/staticModifierAlreadySeen.js
+++ b/tests/baselines/reference/staticModifierAlreadySeen.js
@@ -11,4 +11,4 @@ var C = (function () {
     C.bar = function () { };
     C.foo = 1;
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticMustPrecedePublic.js b/tests/baselines/reference/staticMustPrecedePublic.js
index 45882488e729c..c01a06ff27c82 100644
--- a/tests/baselines/reference/staticMustPrecedePublic.js
+++ b/tests/baselines/reference/staticMustPrecedePublic.js
@@ -10,4 +10,4 @@ var Outer = (function () {
     function Outer() {
     }
     return Outer;
-})();
+}());
diff --git a/tests/baselines/reference/staticOffOfInstance1.js b/tests/baselines/reference/staticOffOfInstance1.js
index 58cf24d0529ed..fa9f99f71fb2f 100644
--- a/tests/baselines/reference/staticOffOfInstance1.js
+++ b/tests/baselines/reference/staticOffOfInstance1.js
@@ -15,4 +15,4 @@ var List = (function () {
     };
     List.Foo = function () { };
     return List;
-})();
+}());
diff --git a/tests/baselines/reference/staticOffOfInstance2.js b/tests/baselines/reference/staticOffOfInstance2.js
index ceac77419a498..e23416e29ddcc 100644
--- a/tests/baselines/reference/staticOffOfInstance2.js
+++ b/tests/baselines/reference/staticOffOfInstance2.js
@@ -18,4 +18,4 @@ var List = (function () {
     };
     List.Foo = function () { };
     return List;
-})();
+}());
diff --git a/tests/baselines/reference/staticPropSuper.js b/tests/baselines/reference/staticPropSuper.js
index 3f75dc8e26bb9..f4bc5ece8d1cd 100644
--- a/tests/baselines/reference/staticPropSuper.js
+++ b/tests/baselines/reference/staticPropSuper.js
@@ -45,7 +45,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -54,7 +54,7 @@ var B = (function (_super) {
     }
     B.s = 9;
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -62,7 +62,7 @@ var C = (function (_super) {
         var x = 1; // should error
     }
     return C;
-})(A);
+}(A));
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -70,7 +70,7 @@ var D = (function (_super) {
         var x = 1; // should error
     }
     return D;
-})(A);
+}(A));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -78,4 +78,4 @@ var E = (function (_super) {
         var x = 1; // should error
     }
     return E;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js b/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js
index 50252c606f438..71db1ca8ef198 100644
--- a/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js
+++ b/tests/baselines/reference/staticPropertyAndFunctionWithSameName.js
@@ -14,10 +14,10 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     D.prototype.f = function () { };
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/staticPropertyNotInClassType.js b/tests/baselines/reference/staticPropertyNotInClassType.js
index e9df2b2158d18..60fd3b808cac5 100644
--- a/tests/baselines/reference/staticPropertyNotInClassType.js
+++ b/tests/baselines/reference/staticPropertyNotInClassType.js
@@ -55,7 +55,7 @@ var NonGeneric;
             configurable: true
         });
         return C;
-    })();
+    }());
     var C;
     (function (C) {
         C.bar = ''; // not reflected in class type
@@ -81,7 +81,7 @@ var Generic;
             configurable: true
         });
         return C;
-    })();
+    }());
     var C;
     (function (C) {
         C.bar = ''; // not reflected in class type
diff --git a/tests/baselines/reference/staticPrototypeProperty.js b/tests/baselines/reference/staticPrototypeProperty.js
index 471ec743b597a..65e53b5522baa 100644
--- a/tests/baselines/reference/staticPrototypeProperty.js
+++ b/tests/baselines/reference/staticPrototypeProperty.js
@@ -13,9 +13,9 @@ var C = (function () {
     }
     C.prototype = function () { };
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/staticPrototypePropertyOnClass.js b/tests/baselines/reference/staticPrototypePropertyOnClass.js
index 0782c47ee2880..dff9a58073e88 100644
--- a/tests/baselines/reference/staticPrototypePropertyOnClass.js
+++ b/tests/baselines/reference/staticPrototypePropertyOnClass.js
@@ -23,22 +23,22 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var c2 = (function () {
     function c2() {
     }
     return c2;
-})();
+}());
 var c3 = (function () {
     function c3() {
     }
     return c3;
-})();
+}());
 var c4 = (function () {
     function c4(param) {
     }
     return c4;
-})();
+}());
 var a = c1;
 var b = c2;
 var c = c3;
diff --git a/tests/baselines/reference/staticVisibility.js b/tests/baselines/reference/staticVisibility.js
index 7dbf49a2baaf3..fd0a3ba52b017 100644
--- a/tests/baselines/reference/staticVisibility.js
+++ b/tests/baselines/reference/staticVisibility.js
@@ -52,7 +52,7 @@ var C1 = (function () {
         C1.s = 1; // should be ok
     };
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
         this.barback = "";
@@ -66,4 +66,4 @@ var C2 = (function () {
         configurable: true
     });
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/statics.js b/tests/baselines/reference/statics.js
index c69fa0aabd79f..3776c09c8ceae 100644
--- a/tests/baselines/reference/statics.js
+++ b/tests/baselines/reference/statics.js
@@ -49,7 +49,7 @@ var M;
         C.pub = 3;
         C.y = C.priv;
         return C;
-    })();
+    }());
     M.C = C;
     var c = C.y;
     function f() {
diff --git a/tests/baselines/reference/staticsInConstructorBodies.js b/tests/baselines/reference/staticsInConstructorBodies.js
index bb91b52a18aa8..9bc3ed293251c 100644
--- a/tests/baselines/reference/staticsInConstructorBodies.js
+++ b/tests/baselines/reference/staticsInConstructorBodies.js
@@ -13,4 +13,4 @@ var C = (function () {
     C.m1 = function () { }; // ERROR
     C.p1 = 0; // ERROR
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/staticsNotInScopeInClodule.js b/tests/baselines/reference/staticsNotInScopeInClodule.js
index 9274a04f8b79d..150ae8aca5b24 100644
--- a/tests/baselines/reference/staticsNotInScopeInClodule.js
+++ b/tests/baselines/reference/staticsNotInScopeInClodule.js
@@ -13,7 +13,7 @@ var Clod = (function () {
     }
     Clod.x = 10;
     return Clod;
-})();
+}());
 var Clod;
 (function (Clod) {
     var p = x; // x isn't in scope here
diff --git a/tests/baselines/reference/strictModeInConstructor.js b/tests/baselines/reference/strictModeInConstructor.js
index 7d1adc48fa069..3b31586154856 100644
--- a/tests/baselines/reference/strictModeInConstructor.js
+++ b/tests/baselines/reference/strictModeInConstructor.js
@@ -70,7 +70,7 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -79,7 +79,7 @@ var B = (function (_super) {
         _super.call(this);
     }
     return B;
-})(A);
+}(A));
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -88,7 +88,7 @@ var C = (function (_super) {
         "use strict";
     }
     return C;
-})(A);
+}(A));
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -98,7 +98,7 @@ var D = (function (_super) {
         "use strict";
     }
     return D;
-})(A);
+}(A));
 var Bs = (function (_super) {
     __extends(Bs, _super);
     function Bs() {
@@ -107,7 +107,7 @@ var Bs = (function (_super) {
     }
     Bs.s = 9;
     return Bs;
-})(A);
+}(A));
 var Cs = (function (_super) {
     __extends(Cs, _super);
     function Cs() {
@@ -116,7 +116,7 @@ var Cs = (function (_super) {
     }
     Cs.s = 9;
     return Cs;
-})(A);
+}(A));
 var Ds = (function (_super) {
     __extends(Ds, _super);
     function Ds() {
@@ -126,4 +126,4 @@ var Ds = (function (_super) {
     }
     Ds.s = 9;
     return Ds;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/strictModeReservedWord.js b/tests/baselines/reference/strictModeReservedWord.js
index bec159dee6f6b..210d9ec75be64 100644
--- a/tests/baselines/reference/strictModeReservedWord.js
+++ b/tests/baselines/reference/strictModeReservedWord.js
@@ -51,7 +51,7 @@ function foo() {
             _super.apply(this, arguments);
         }
         return package;
-    })(public);
+    }(public));
     var b;
     function foo(x) { }
     function foo1(x) { }
diff --git a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
index e4bef7913749f..281b4ade5d6b7 100644
--- a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
+++ b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
@@ -40,7 +40,7 @@ var Foo = (function () {
     }
     Foo.prototype.banana = function (x) { };
     return Foo;
-})();
+}());
 var C = (function () {
     function C(public, let) {
         this.public = public;
@@ -51,38 +51,38 @@ var C = (function () {
     };
     C.prototype.pulbic = function () { }; // No Error;
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
     return E;
-})();
+}());
 var F = (function () {
     function F() {
     }
     return F;
-})();
+}());
 var F1 = (function () {
     function F1() {
     }
     return F1;
-})();
+}());
 var G = (function (_super) {
     __extends(G, _super);
     function G() {
         _super.apply(this, arguments);
     }
     return G;
-})(package);
+}(package));
 var H = (function (_super) {
     __extends(H, _super);
     function H() {
         _super.apply(this, arguments);
     }
     return H;
-})(package.A);
+}(package.A));
diff --git a/tests/baselines/reference/strictModeUseContextualKeyword.js b/tests/baselines/reference/strictModeUseContextualKeyword.js
index 33ceae360311d..d21463f3b398f 100644
--- a/tests/baselines/reference/strictModeUseContextualKeyword.js
+++ b/tests/baselines/reference/strictModeUseContextualKeyword.js
@@ -22,7 +22,7 @@ var C = (function () {
     }
     C.prototype.as = function () { };
     return C;
-})();
+}());
 function F() {
     function as() { }
 }
diff --git a/tests/baselines/reference/stringIndexerAndConstructor.js b/tests/baselines/reference/stringIndexerAndConstructor.js
index db3b9b8770be3..7e38cff755552 100644
--- a/tests/baselines/reference/stringIndexerAndConstructor.js
+++ b/tests/baselines/reference/stringIndexerAndConstructor.js
@@ -19,4 +19,4 @@ var C = (function () {
     }
     C.v = function () { };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/stringIndexerAssignments2.js b/tests/baselines/reference/stringIndexerAssignments2.js
index 8f909cc720624..94ce262aadca0 100644
--- a/tests/baselines/reference/stringIndexerAssignments2.js
+++ b/tests/baselines/reference/stringIndexerAssignments2.js
@@ -25,17 +25,17 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var x;
 var a;
 var b;
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js
index 9d70b66887c00..57df8ce288351 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js
@@ -123,7 +123,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var a;
 // error
 var b = {
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
index 97e3e9b0f5b0a..08a26230f3742 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
@@ -51,7 +51,7 @@ var A = (function () {
     }
     A.prototype.foo = function () { return ''; };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -59,12 +59,12 @@ var B = (function (_super) {
     }
     B.prototype.bar = function () { return ''; };
     return B;
-})(A);
+}(A));
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var a;
 // error
 var b = {
diff --git a/tests/baselines/reference/stringIndexingResults.js b/tests/baselines/reference/stringIndexingResults.js
index a6e00d92ec2aa..53f82340353db 100644
--- a/tests/baselines/reference/stringIndexingResults.js
+++ b/tests/baselines/reference/stringIndexingResults.js
@@ -41,7 +41,7 @@ var C = (function () {
         this.y = '';
     }
     return C;
-})();
+}());
 var c;
 var r1 = c['y'];
 var r2 = c['a'];
diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js
index 01b5dc814a7de..78417b9a082bc 100644
--- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js
+++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js
@@ -141,7 +141,7 @@ var C = (function () {
     C.prototype.substr = function (from, length) { return null; };
     C.prototype.valueOf = function () { return null; };
     return C;
-})();
+}());
 function f10(x) { }
 function f11(x) { }
 function f12(x) { }
diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js
index 724c20c6309af..e9bdc90ecf33b 100644
--- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js
+++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures.js
@@ -36,7 +36,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: function (x) { },
diff --git a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js
index 5050709c2139d..a33c6424eda6c 100644
--- a/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js
+++ b/tests/baselines/reference/stringLiteralTypesInImplementationSignatures2.js
@@ -37,7 +37,7 @@ var C = (function () {
     }
     C.prototype.foo = function (x) { };
     return C;
-})();
+}());
 var a;
 var b = {
     foo: function (x) { },
diff --git a/tests/baselines/reference/stringNamedPropertyAccess.js b/tests/baselines/reference/stringNamedPropertyAccess.js
index cdc8603a0e704..01b634faf5ff7 100644
--- a/tests/baselines/reference/stringNamedPropertyAccess.js
+++ b/tests/baselines/reference/stringNamedPropertyAccess.js
@@ -28,7 +28,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var r1 = c["a b"];
 var r1b = C['c d'];
diff --git a/tests/baselines/reference/stringNamedPropertyDuplicates.js b/tests/baselines/reference/stringNamedPropertyDuplicates.js
index 214bb9921e99a..a1b4822b5da89 100644
--- a/tests/baselines/reference/stringNamedPropertyDuplicates.js
+++ b/tests/baselines/reference/stringNamedPropertyDuplicates.js
@@ -26,7 +26,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var a;
 var b = {
     "a b": 1,
diff --git a/tests/baselines/reference/stripInternal1.js b/tests/baselines/reference/stripInternal1.js
index c5d350bcd8619..e5fbe40df7ab7 100644
--- a/tests/baselines/reference/stripInternal1.js
+++ b/tests/baselines/reference/stripInternal1.js
@@ -14,7 +14,7 @@ var C = (function () {
     // @internal
     C.prototype.bar = function () { };
     return C;
-})();
+}());
 
 
 //// [stripInternal1.d.ts]
diff --git a/tests/baselines/reference/subtypesOfAny.js b/tests/baselines/reference/subtypesOfAny.js
index e73a120ed63b1..0b2965cb8205b 100644
--- a/tests/baselines/reference/subtypesOfAny.js
+++ b/tests/baselines/reference/subtypesOfAny.js
@@ -139,12 +139,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var E;
 (function (E) {
     E[E["A"] = 0] = "A";
@@ -158,7 +158,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var c;
 (function (c) {
     c.bar = 1;
diff --git a/tests/baselines/reference/subtypesOfTypeParameter.js b/tests/baselines/reference/subtypesOfTypeParameter.js
index c7b14a4129cd8..10d9e3e42eca4 100644
--- a/tests/baselines/reference/subtypesOfTypeParameter.js
+++ b/tests/baselines/reference/subtypesOfTypeParameter.js
@@ -116,14 +116,14 @@ var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
         _super.apply(this, arguments);
     }
     return D1;
-})(C3);
+}(C3));
 function f1(x, y) {
     var r = true ? x : y; // error
     var r = true ? y : x; // error
@@ -132,12 +132,12 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var E;
 (function (E) {
     E[E["A"] = 0] = "A";
@@ -151,7 +151,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var c;
 (function (c) {
     c.bar = 1;
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
index 194c183514742..0753c52dc9eb7 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
@@ -178,35 +178,35 @@ var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
         _super.apply(this, arguments);
     }
     return D1;
-})(C3);
+}(C3));
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
         _super.apply(this, arguments);
     }
     return D2;
-})(C3);
+}(C3));
 var D3 = (function (_super) {
     __extends(D3, _super);
     function D3() {
         _super.apply(this, arguments);
     }
     return D3;
-})(C3);
+}(C3));
 var D4 = (function (_super) {
     __extends(D4, _super);
     function D4() {
         _super.apply(this, arguments);
     }
     return D4;
-})(C3);
+}(C3));
 // V > U > T
 // test if T is subtype of T, U, V
 // should all work
@@ -216,21 +216,21 @@ var D5 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D5;
-})(C3);
+}(C3));
 var D6 = (function (_super) {
     __extends(D6, _super);
     function D6() {
         _super.apply(this, arguments);
     }
     return D6;
-})(C3);
+}(C3));
 var D7 = (function (_super) {
     __extends(D7, _super);
     function D7() {
         _super.apply(this, arguments);
     }
     return D7;
-})(C3);
+}(C3));
 // test if U is a subtype of T, U, V
 // only a subtype of V and itself
 var D8 = (function (_super) {
@@ -239,21 +239,21 @@ var D8 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D8;
-})(C3);
+}(C3));
 var D9 = (function (_super) {
     __extends(D9, _super);
     function D9() {
         _super.apply(this, arguments);
     }
     return D9;
-})(C3);
+}(C3));
 var D10 = (function (_super) {
     __extends(D10, _super);
     function D10() {
         _super.apply(this, arguments);
     }
     return D10;
-})(C3);
+}(C3));
 // test if V is a subtype of T, U, V
 // only a subtype of itself
 var D11 = (function (_super) {
@@ -262,21 +262,21 @@ var D11 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D11;
-})(C3);
+}(C3));
 var D12 = (function (_super) {
     __extends(D12, _super);
     function D12() {
         _super.apply(this, arguments);
     }
     return D12;
-})(C3);
+}(C3));
 var D13 = (function (_super) {
     __extends(D13, _super);
     function D13() {
         _super.apply(this, arguments);
     }
     return D13;
-})(C3);
+}(C3));
 // Date > V > U > T
 // test if T is subtype of T, U, V, Date
 // should all work
@@ -286,28 +286,28 @@ var D14 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D14;
-})(C3);
+}(C3));
 var D15 = (function (_super) {
     __extends(D15, _super);
     function D15() {
         _super.apply(this, arguments);
     }
     return D15;
-})(C3);
+}(C3));
 var D16 = (function (_super) {
     __extends(D16, _super);
     function D16() {
         _super.apply(this, arguments);
     }
     return D16;
-})(C3);
+}(C3));
 var D17 = (function (_super) {
     __extends(D17, _super);
     function D17() {
         _super.apply(this, arguments);
     }
     return D17;
-})(C3);
+}(C3));
 // test if U is a subtype of T, U, V, Date
 // only a subtype of V, Date and itself
 var D18 = (function (_super) {
@@ -316,28 +316,28 @@ var D18 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D18;
-})(C3);
+}(C3));
 var D19 = (function (_super) {
     __extends(D19, _super);
     function D19() {
         _super.apply(this, arguments);
     }
     return D19;
-})(C3);
+}(C3));
 var D20 = (function (_super) {
     __extends(D20, _super);
     function D20() {
         _super.apply(this, arguments);
     }
     return D20;
-})(C3);
+}(C3));
 var D21 = (function (_super) {
     __extends(D21, _super);
     function D21() {
         _super.apply(this, arguments);
     }
     return D21;
-})(C3);
+}(C3));
 // test if V is a subtype of T, U, V, Date
 // only a subtype of itself and Date
 var D22 = (function (_super) {
@@ -346,28 +346,28 @@ var D22 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D22;
-})(C3);
+}(C3));
 var D23 = (function (_super) {
     __extends(D23, _super);
     function D23() {
         _super.apply(this, arguments);
     }
     return D23;
-})(C3);
+}(C3));
 var D24 = (function (_super) {
     __extends(D24, _super);
     function D24() {
         _super.apply(this, arguments);
     }
     return D24;
-})(C3);
+}(C3));
 var D25 = (function (_super) {
     __extends(D25, _super);
     function D25() {
         _super.apply(this, arguments);
     }
     return D25;
-})(C3);
+}(C3));
 // test if Date is a subtype of T, U, V, Date
 // only a subtype of itself
 var D26 = (function (_super) {
@@ -376,25 +376,25 @@ var D26 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D26;
-})(C3);
+}(C3));
 var D27 = (function (_super) {
     __extends(D27, _super);
     function D27() {
         _super.apply(this, arguments);
     }
     return D27;
-})(C3);
+}(C3));
 var D28 = (function (_super) {
     __extends(D28, _super);
     function D28() {
         _super.apply(this, arguments);
     }
     return D28;
-})(C3);
+}(C3));
 var D29 = (function (_super) {
     __extends(D29, _super);
     function D29() {
         _super.apply(this, arguments);
     }
     return D29;
-})(C3);
+}(C3));
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js
index e1c137f77e4ab..771c2ef74f5b3 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints2.js
@@ -189,12 +189,12 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var E;
 (function (E) {
     E[E["A"] = 0] = "A";
@@ -208,7 +208,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var c;
 (function (c) {
     c.bar = 1;
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
index 370bbf2b8ff16..f388bd4e04759 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
@@ -89,7 +89,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 function f(t, u, v) {
     // ok
     var r = true ? t : u;
@@ -114,67 +114,67 @@ var B1 = (function () {
     function B1() {
     }
     return B1;
-})();
+}());
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
         _super.apply(this, arguments);
     }
     return D1;
-})(B1);
+}(B1));
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
         _super.apply(this, arguments);
     }
     return D2;
-})(B1);
+}(B1));
 var D3 = (function (_super) {
     __extends(D3, _super);
     function D3() {
         _super.apply(this, arguments);
     }
     return D3;
-})(B1);
+}(B1));
 var D4 = (function (_super) {
     __extends(D4, _super);
     function D4() {
         _super.apply(this, arguments);
     }
     return D4;
-})(B1);
+}(B1));
 var D5 = (function (_super) {
     __extends(D5, _super);
     function D5() {
         _super.apply(this, arguments);
     }
     return D5;
-})(B1);
+}(B1));
 var D6 = (function (_super) {
     __extends(D6, _super);
     function D6() {
         _super.apply(this, arguments);
     }
     return D6;
-})(B1);
+}(B1));
 var D7 = (function (_super) {
     __extends(D7, _super);
     function D7() {
         _super.apply(this, arguments);
     }
     return D7;
-})(B1);
+}(B1));
 var D8 = (function (_super) {
     __extends(D8, _super);
     function D8() {
         _super.apply(this, arguments);
     }
     return D8;
-})(B1);
+}(B1));
 var D9 = (function (_super) {
     __extends(D9, _super);
     function D9() {
         _super.apply(this, arguments);
     }
     return D9;
-})(B1);
+}(B1));
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
index c5d4e68b516ad..cffda7d7f5527 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
@@ -168,7 +168,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 function f(t, u, v) {
     // ok
     var r1 = true ? t : u;
@@ -213,70 +213,70 @@ var M1;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var D1 = (function (_super) {
         __extends(D1, _super);
         function D1() {
             _super.apply(this, arguments);
         }
         return D1;
-    })(Base);
+    }(Base));
     var D2 = (function (_super) {
         __extends(D2, _super);
         function D2() {
             _super.apply(this, arguments);
         }
         return D2;
-    })(Base);
+    }(Base));
     var D3 = (function (_super) {
         __extends(D3, _super);
         function D3() {
             _super.apply(this, arguments);
         }
         return D3;
-    })(Base);
+    }(Base));
     var D4 = (function (_super) {
         __extends(D4, _super);
         function D4() {
             _super.apply(this, arguments);
         }
         return D4;
-    })(Base);
+    }(Base));
     var D5 = (function (_super) {
         __extends(D5, _super);
         function D5() {
             _super.apply(this, arguments);
         }
         return D5;
-    })(Base);
+    }(Base));
     var D6 = (function (_super) {
         __extends(D6, _super);
         function D6() {
             _super.apply(this, arguments);
         }
         return D6;
-    })(Base);
+    }(Base));
     var D7 = (function (_super) {
         __extends(D7, _super);
         function D7() {
             _super.apply(this, arguments);
         }
         return D7;
-    })(Base);
+    }(Base));
     var D8 = (function (_super) {
         __extends(D8, _super);
         function D8() {
             _super.apply(this, arguments);
         }
         return D8;
-    })(Base);
+    }(Base));
     var D9 = (function (_super) {
         __extends(D9, _super);
         function D9() {
             _super.apply(this, arguments);
         }
         return D9;
-    })(Base);
+    }(Base));
 })(M1 || (M1 = {}));
 var M2;
 (function (M2) {
@@ -284,68 +284,68 @@ var M2;
         function Base2() {
         }
         return Base2;
-    })();
+    }());
     var D1 = (function (_super) {
         __extends(D1, _super);
         function D1() {
             _super.apply(this, arguments);
         }
         return D1;
-    })(Base2);
+    }(Base2));
     var D2 = (function (_super) {
         __extends(D2, _super);
         function D2() {
             _super.apply(this, arguments);
         }
         return D2;
-    })(Base2);
+    }(Base2));
     var D3 = (function (_super) {
         __extends(D3, _super);
         function D3() {
             _super.apply(this, arguments);
         }
         return D3;
-    })(Base2);
+    }(Base2));
     var D4 = (function (_super) {
         __extends(D4, _super);
         function D4() {
             _super.apply(this, arguments);
         }
         return D4;
-    })(Base2);
+    }(Base2));
     var D5 = (function (_super) {
         __extends(D5, _super);
         function D5() {
             _super.apply(this, arguments);
         }
         return D5;
-    })(Base2);
+    }(Base2));
     var D6 = (function (_super) {
         __extends(D6, _super);
         function D6() {
             _super.apply(this, arguments);
         }
         return D6;
-    })(Base2);
+    }(Base2));
     var D7 = (function (_super) {
         __extends(D7, _super);
         function D7() {
             _super.apply(this, arguments);
         }
         return D7;
-    })(Base2);
+    }(Base2));
     var D8 = (function (_super) {
         __extends(D8, _super);
         function D8() {
             _super.apply(this, arguments);
         }
         return D8;
-    })(Base2);
+    }(Base2));
     var D9 = (function (_super) {
         __extends(D9, _super);
         function D9() {
             _super.apply(this, arguments);
         }
         return D9;
-    })(Base2);
+    }(Base2));
 })(M2 || (M2 = {}));
diff --git a/tests/baselines/reference/subtypesOfUnion.js b/tests/baselines/reference/subtypesOfUnion.js
index 926efc3e921e8..cc0fdea7346d1 100644
--- a/tests/baselines/reference/subtypesOfUnion.js
+++ b/tests/baselines/reference/subtypesOfUnion.js
@@ -62,12 +62,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 function f() { }
 var f;
 (function (f) {
@@ -77,7 +77,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var c;
 (function (c) {
     c.bar = 1;
diff --git a/tests/baselines/reference/subtypingTransitivity.js b/tests/baselines/reference/subtypingTransitivity.js
index 9bc5cd93209d6..9d3df207a0ce1 100644
--- a/tests/baselines/reference/subtypingTransitivity.js
+++ b/tests/baselines/reference/subtypingTransitivity.js
@@ -29,21 +29,21 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(B);
+}(B));
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
         _super.apply(this, arguments);
     }
     return D2;
-})(B);
+}(B));
 var b;
 var d;
 var d2;
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.js b/tests/baselines/reference/subtypingWithCallSignatures2.js
index f11b83c4da679..014ce4a30038f 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.js
@@ -183,28 +183,28 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
 var r1arg1 = function (x) { return [x]; };
 var r1arg2 = function (x) { return [1]; };
 var r1 = foo1(r1arg1); // any, return types are not subtype of first overload
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.js b/tests/baselines/reference/subtypingWithCallSignatures3.js
index 2b45b75b95fe4..55f5fa60e7154 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.js
@@ -132,28 +132,28 @@ var Errors;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
             _super.apply(this, arguments);
         }
         return Derived;
-    })(Base);
+    }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
             _super.apply(this, arguments);
         }
         return Derived2;
-    })(Derived);
+    }(Derived));
     var OtherDerived = (function (_super) {
         __extends(OtherDerived, _super);
         function OtherDerived() {
             _super.apply(this, arguments);
         }
         return OtherDerived;
-    })(Base);
+    }(Base));
     var r1 = foo2(function (x) { return null; }); // any
     var r1a = [function (x) { return ['']; }, function (x) { return null; }];
     var r1b = [function (x) { return null; }, function (x) { return ['']; }];
diff --git a/tests/baselines/reference/subtypingWithCallSignatures4.js b/tests/baselines/reference/subtypingWithCallSignatures4.js
index d1d30437cd60e..b8839316e8669 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.js
@@ -122,28 +122,28 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
 var r1arg = function (x) { return null; };
 var r1arg2 = function (x) { return null; };
 var r1 = foo1(r1arg);
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.js b/tests/baselines/reference/subtypingWithConstructSignatures2.js
index df050ffd6e92f..c4168febf4eea 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.js
@@ -183,28 +183,28 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
 var r1arg1;
 var r1arg2;
 var r1 = foo1(r1arg1); // any, return types are not subtype of first overload
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.js b/tests/baselines/reference/subtypingWithConstructSignatures3.js
index ccc6fb872c528..171e52505e0a9 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.js
@@ -134,28 +134,28 @@ var Errors;
         function Base() {
         }
         return Base;
-    })();
+    }());
     var Derived = (function (_super) {
         __extends(Derived, _super);
         function Derived() {
             _super.apply(this, arguments);
         }
         return Derived;
-    })(Base);
+    }(Base));
     var Derived2 = (function (_super) {
         __extends(Derived2, _super);
         function Derived2() {
             _super.apply(this, arguments);
         }
         return Derived2;
-    })(Derived);
+    }(Derived));
     var OtherDerived = (function (_super) {
         __extends(OtherDerived, _super);
         function OtherDerived() {
             _super.apply(this, arguments);
         }
         return OtherDerived;
-    })(Base);
+    }(Base));
     var r1arg1;
     var r1arg2;
     var r1 = foo2(r1arg1); // any
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures4.js b/tests/baselines/reference/subtypingWithConstructSignatures4.js
index 67b83aa94c940..1152dde04dd29 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.js
@@ -122,28 +122,28 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
 var r1arg;
 var r1arg2;
 var r1 = foo1(r1arg);
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures5.js b/tests/baselines/reference/subtypingWithConstructSignatures5.js
index ec3bad2c1f327..24a5ce77dd00d 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.js
@@ -60,25 +60,25 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures6.js b/tests/baselines/reference/subtypingWithConstructSignatures6.js
index 1c7a2d883c32b..8778255dbd576 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures6.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures6.js
@@ -63,25 +63,25 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
         _super.apply(this, arguments);
     }
     return OtherDerived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer.js b/tests/baselines/reference/subtypingWithNumericIndexer.js
index 2ad6a2ebedced..cd447c116daee 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer.js
@@ -50,54 +50,54 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
         _super.apply(this, arguments);
     }
     return B2;
-})(A);
+}(A));
 var Generics;
 (function (Generics) {
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     var B2 = (function (_super) {
         __extends(B2, _super);
         function B2() {
             _super.apply(this, arguments);
         }
         return B2;
-    })(A);
+    }(A));
     var B3 = (function (_super) {
         __extends(B3, _super);
         function B3() {
             _super.apply(this, arguments);
         }
         return B3;
-    })(A);
+    }(A));
     var B4 = (function (_super) {
         __extends(B4, _super);
         function B4() {
             _super.apply(this, arguments);
         }
         return B4;
-    })(A);
+    }(A));
 })(Generics || (Generics = {}));
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.js b/tests/baselines/reference/subtypingWithNumericIndexer3.js
index f4c2d1d9da915..104141b761d5f 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer3.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer3.js
@@ -54,61 +54,61 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
         _super.apply(this, arguments);
     }
     return B2;
-})(A);
+}(A));
 var Generics;
 (function (Generics) {
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     var B2 = (function (_super) {
         __extends(B2, _super);
         function B2() {
             _super.apply(this, arguments);
         }
         return B2;
-    })(A);
+    }(A));
     var B3 = (function (_super) {
         __extends(B3, _super);
         function B3() {
             _super.apply(this, arguments);
         }
         return B3;
-    })(A);
+    }(A));
     var B4 = (function (_super) {
         __extends(B4, _super);
         function B4() {
             _super.apply(this, arguments);
         }
         return B4;
-    })(A);
+    }(A));
     var B5 = (function (_super) {
         __extends(B5, _super);
         function B5() {
             _super.apply(this, arguments);
         }
         return B5;
-    })(A);
+    }(A));
 })(Generics || (Generics = {}));
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.js b/tests/baselines/reference/subtypingWithNumericIndexer4.js
index 7956464d1725f..59f8cd95ad01d 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.js
@@ -38,33 +38,33 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var Generics;
 (function (Generics) {
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     var B3 = (function (_super) {
         __extends(B3, _super);
         function B3() {
             _super.apply(this, arguments);
         }
         return B3;
-    })(A);
+    }(A));
 })(Generics || (Generics = {}));
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer5.js b/tests/baselines/reference/subtypingWithNumericIndexer5.js
index 4c6f785e1a9aa..50e54d888e739 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer5.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer5.js
@@ -49,37 +49,37 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var B2 = (function () {
     function B2() {
     }
     return B2;
-})();
+}());
 var Generics;
 (function (Generics) {
     var B = (function () {
         function B() {
         }
         return B;
-    })();
+    }());
     var B2 = (function () {
         function B2() {
         }
         return B2;
-    })();
+    }());
     var B3 = (function () {
         function B3() {
         }
         return B3;
-    })();
+    }());
     var B4 = (function () {
         function B4() {
         }
         return B4;
-    })();
+    }());
     var B5 = (function () {
         function B5() {
         }
         return B5;
-    })();
+    }());
 })(Generics || (Generics = {}));
diff --git a/tests/baselines/reference/subtypingWithObjectMembers.js b/tests/baselines/reference/subtypingWithObjectMembers.js
index fc452ba8cf490..c3cef6601e6b0 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers.js
@@ -77,95 +77,95 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Derived);
+}(Derived));
 // N and M have the same name, same accessibility, same optionality, and N is a subtype of M
 // foo properties are valid, bar properties cause errors in the derived class declarations
 var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
         _super.apply(this, arguments);
     }
     return B2;
-})(A2);
+}(A2));
 var A3 = (function () {
     function A3() {
     }
     return A3;
-})();
+}());
 var B3 = (function (_super) {
     __extends(B3, _super);
     function B3() {
         _super.apply(this, arguments);
     }
     return B3;
-})(A3);
+}(A3));
 var TwoLevels;
 (function (TwoLevels) {
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     var A2 = (function () {
         function A2() {
         }
         return A2;
-    })();
+    }());
     var B2 = (function (_super) {
         __extends(B2, _super);
         function B2() {
             _super.apply(this, arguments);
         }
         return B2;
-    })(A2);
+    }(A2));
     var A3 = (function () {
         function A3() {
         }
         return A3;
-    })();
+    }());
     var B3 = (function (_super) {
         __extends(B3, _super);
         function B3() {
             _super.apply(this, arguments);
         }
         return B3;
-    })(A3);
+    }(A3));
 })(TwoLevels || (TwoLevels = {}));
diff --git a/tests/baselines/reference/subtypingWithObjectMembers4.js b/tests/baselines/reference/subtypingWithObjectMembers4.js
index 487a5969f71e4..d5c1107e45d56 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers4.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers4.js
@@ -44,47 +44,47 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
         _super.apply(this, arguments);
     }
     return B2;
-})(A2);
+}(A2));
 var A3 = (function () {
     function A3() {
     }
     return A3;
-})();
+}());
 var B3 = (function (_super) {
     __extends(B3, _super);
     function B3() {
         _super.apply(this, arguments);
     }
     return B3;
-})(A3);
+}(A3));
diff --git a/tests/baselines/reference/subtypingWithObjectMembers5.js b/tests/baselines/reference/subtypingWithObjectMembers5.js
index 55ea5ade0da3b..f01a603f56342 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers5.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers5.js
@@ -71,17 +71,17 @@ var NotOptional;
         function B() {
         }
         return B;
-    })();
+    }());
     var B2 = (function () {
         function B2() {
         }
         return B2;
-    })();
+    }());
     var B3 = (function () {
         function B3() {
         }
         return B3;
-    })();
+    }());
 })(NotOptional || (NotOptional = {}));
 // same cases as above but with optional
 var Optional;
@@ -90,15 +90,15 @@ var Optional;
         function B() {
         }
         return B;
-    })();
+    }());
     var B2 = (function () {
         function B2() {
         }
         return B2;
-    })();
+    }());
     var B3 = (function () {
         function B3() {
         }
         return B3;
-    })();
+    }());
 })(Optional || (Optional = {}));
diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
index f08f2367d2cef..25faacad88e4c 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
@@ -44,47 +44,47 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
         _super.apply(this, arguments);
     }
     return B2;
-})(A2);
+}(A2));
 var A3 = (function () {
     function A3() {
     }
     return A3;
-})();
+}());
 var B3 = (function (_super) {
     __extends(B3, _super);
     function B3() {
         _super.apply(this, arguments);
     }
     return B3;
-})(A3);
+}(A3));
diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
index c23405cd50c60..7b0398143a28c 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
@@ -72,52 +72,52 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
         _super.apply(this, arguments);
     }
     return Derived;
-})(Base);
+}(Base));
 var ExplicitPublic;
 (function (ExplicitPublic) {
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     var A2 = (function () {
         function A2() {
         }
         return A2;
-    })();
+    }());
     var B2 = (function (_super) {
         __extends(B2, _super);
         function B2() {
             _super.apply(this, arguments);
         }
         return B2;
-    })(A2);
+    }(A2));
     var A3 = (function () {
         function A3() {
         }
         return A3;
-    })();
+    }());
     var B3 = (function (_super) {
         __extends(B3, _super);
         function B3() {
             _super.apply(this, arguments);
         }
         return B3;
-    })(A3);
+    }(A3));
 })(ExplicitPublic || (ExplicitPublic = {}));
 var ImplicitPublic;
 (function (ImplicitPublic) {
@@ -125,36 +125,36 @@ var ImplicitPublic;
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     var A2 = (function () {
         function A2() {
         }
         return A2;
-    })();
+    }());
     var B2 = (function (_super) {
         __extends(B2, _super);
         function B2() {
             _super.apply(this, arguments);
         }
         return B2;
-    })(A2);
+    }(A2));
     var A3 = (function () {
         function A3() {
         }
         return A3;
-    })();
+    }());
     var B3 = (function (_super) {
         __extends(B3, _super);
         function B3() {
             _super.apply(this, arguments);
         }
         return B3;
-    })(A3);
+    }(A3));
 })(ImplicitPublic || (ImplicitPublic = {}));
diff --git a/tests/baselines/reference/subtypingWithStringIndexer.js b/tests/baselines/reference/subtypingWithStringIndexer.js
index 5f606520a651c..0740743a5d9c3 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer.js
@@ -51,54 +51,54 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
         _super.apply(this, arguments);
     }
     return B2;
-})(A);
+}(A));
 var Generics;
 (function (Generics) {
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     var B2 = (function (_super) {
         __extends(B2, _super);
         function B2() {
             _super.apply(this, arguments);
         }
         return B2;
-    })(A);
+    }(A));
     var B3 = (function (_super) {
         __extends(B3, _super);
         function B3() {
             _super.apply(this, arguments);
         }
         return B3;
-    })(A);
+    }(A));
     var B4 = (function (_super) {
         __extends(B4, _super);
         function B4() {
             _super.apply(this, arguments);
         }
         return B4;
-    })(A);
+    }(A));
 })(Generics || (Generics = {}));
diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.js b/tests/baselines/reference/subtypingWithStringIndexer3.js
index 6ce66c4e723e1..5ed44177d5283 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer3.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer3.js
@@ -54,61 +54,61 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var B2 = (function (_super) {
     __extends(B2, _super);
     function B2() {
         _super.apply(this, arguments);
     }
     return B2;
-})(A);
+}(A));
 var Generics;
 (function (Generics) {
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     var B2 = (function (_super) {
         __extends(B2, _super);
         function B2() {
             _super.apply(this, arguments);
         }
         return B2;
-    })(A);
+    }(A));
     var B3 = (function (_super) {
         __extends(B3, _super);
         function B3() {
             _super.apply(this, arguments);
         }
         return B3;
-    })(A);
+    }(A));
     var B4 = (function (_super) {
         __extends(B4, _super);
         function B4() {
             _super.apply(this, arguments);
         }
         return B4;
-    })(A);
+    }(A));
     var B5 = (function (_super) {
         __extends(B5, _super);
         function B5() {
             _super.apply(this, arguments);
         }
         return B5;
-    })(A);
+    }(A));
 })(Generics || (Generics = {}));
diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.js b/tests/baselines/reference/subtypingWithStringIndexer4.js
index 19d36e475c277..d6fb874c0900b 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.js
@@ -38,33 +38,33 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.apply(this, arguments);
     }
     return B;
-})(A);
+}(A));
 var Generics;
 (function (Generics) {
     var A = (function () {
         function A() {
         }
         return A;
-    })();
+    }());
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
             _super.apply(this, arguments);
         }
         return B;
-    })(A);
+    }(A));
     var B3 = (function (_super) {
         __extends(B3, _super);
         function B3() {
             _super.apply(this, arguments);
         }
         return B3;
-    })(A);
+    }(A));
 })(Generics || (Generics = {}));
diff --git a/tests/baselines/reference/super.js b/tests/baselines/reference/super.js
index 1d060672cebb6..81d76aec62bc3 100644
--- a/tests/baselines/reference/super.js
+++ b/tests/baselines/reference/super.js
@@ -54,7 +54,7 @@ var Base = (function () {
         return "basebar";
     };
     return Base;
-})();
+}());
 var Sub1 = (function (_super) {
     __extends(Sub1, _super);
     function Sub1() {
@@ -64,7 +64,7 @@ var Sub1 = (function (_super) {
         return "sub1" + _super.prototype.foo.call(this) + _super.prototype.bar.call(this);
     };
     return Sub1;
-})(Base);
+}(Base));
 var SubSub1 = (function (_super) {
     __extends(SubSub1, _super);
     function SubSub1() {
@@ -74,7 +74,7 @@ var SubSub1 = (function (_super) {
         return "subsub1" + _super.prototype.foo.call(this);
     };
     return SubSub1;
-})(Sub1);
+}(Sub1));
 var Base2 = (function () {
     function Base2() {
     }
@@ -82,7 +82,7 @@ var Base2 = (function () {
         _super.prototype.foo.call(this);
     };
     return Base2;
-})();
+}());
 var s = new Sub1();
 var ss = new SubSub1();
 s.foo() + ss.foo();
diff --git a/tests/baselines/reference/super1.js b/tests/baselines/reference/super1.js
index 5c2182d8afbc8..4179843b79a02 100644
--- a/tests/baselines/reference/super1.js
+++ b/tests/baselines/reference/super1.js
@@ -80,7 +80,7 @@ var Base1 = (function () {
         return "base";
     };
     return Base1;
-})();
+}());
 var Sub1 = (function (_super) {
     __extends(Sub1, _super);
     function Sub1() {
@@ -90,7 +90,7 @@ var Sub1 = (function (_super) {
         return "base";
     };
     return Sub1;
-})(Base1);
+}(Base1));
 var SubSub1 = (function (_super) {
     __extends(SubSub1, _super);
     function SubSub1() {
@@ -100,7 +100,7 @@ var SubSub1 = (function (_super) {
         return _super.prototype.super.foo;
     };
     return SubSub1;
-})(Sub1);
+}(Sub1));
 // Case 2
 var Base2 = (function () {
     function Base2() {
@@ -109,7 +109,7 @@ var Base2 = (function () {
         return "base";
     };
     return Base2;
-})();
+}());
 var SubE2 = (function (_super) {
     __extends(SubE2, _super);
     function SubE2() {
@@ -119,7 +119,7 @@ var SubE2 = (function (_super) {
         return _super.prototype.prototype.foo = null;
     };
     return SubE2;
-})(Base2);
+}(Base2));
 // Case 3
 var Base3 = (function () {
     function Base3() {
@@ -128,7 +128,7 @@ var Base3 = (function () {
         return "base";
     };
     return Base3;
-})();
+}());
 var SubE3 = (function (_super) {
     __extends(SubE3, _super);
     function SubE3() {
@@ -138,7 +138,7 @@ var SubE3 = (function (_super) {
         return _super.prototype.bar.call(this);
     };
     return SubE3;
-})(Base3);
+}(Base3));
 // Case 4
 var Base4;
 (function (Base4) {
@@ -149,7 +149,7 @@ var Base4;
             return "hello";
         };
         return Sub4;
-    })();
+    }());
     var SubSub4 = (function (_super) {
         __extends(SubSub4, _super);
         function SubSub4() {
@@ -159,7 +159,7 @@ var Base4;
             return _super.prototype.x.call(this);
         };
         return SubSub4;
-    })(Sub4);
+    }(Sub4));
     Base4.SubSub4 = SubSub4;
     var Sub4E = (function () {
         function Sub4E() {
@@ -168,6 +168,6 @@ var Base4;
             return _super.prototype.x.call(this);
         };
         return Sub4E;
-    })();
+    }());
     Base4.Sub4E = Sub4E;
 })(Base4 || (Base4 = {}));
diff --git a/tests/baselines/reference/super2.js b/tests/baselines/reference/super2.js
index 9d865194a2a73..979bdba84e418 100644
--- a/tests/baselines/reference/super2.js
+++ b/tests/baselines/reference/super2.js
@@ -67,7 +67,7 @@ var Base5 = (function () {
         return "BaseY";
     };
     return Base5;
-})();
+}());
 var Sub5 = (function (_super) {
     __extends(Sub5, _super);
     function Sub5() {
@@ -77,7 +77,7 @@ var Sub5 = (function (_super) {
         return "SubX";
     };
     return Sub5;
-})(Base5);
+}(Base5));
 var SubSub5 = (function (_super) {
     __extends(SubSub5, _super);
     function SubSub5() {
@@ -90,7 +90,7 @@ var SubSub5 = (function (_super) {
         return _super.prototype.y.call(this);
     };
     return SubSub5;
-})(Sub5);
+}(Sub5));
 // Case 6
 var Base6 = (function () {
     function Base6() {
@@ -99,7 +99,7 @@ var Base6 = (function () {
         return "BaseX";
     };
     return Base6;
-})();
+}());
 var Sub6 = (function (_super) {
     __extends(Sub6, _super);
     function Sub6() {
@@ -109,7 +109,7 @@ var Sub6 = (function (_super) {
         return "SubY";
     };
     return Sub6;
-})(Base6);
+}(Base6));
 var SubSub6 = (function (_super) {
     __extends(SubSub6, _super);
     function SubSub6() {
@@ -119,7 +119,7 @@ var SubSub6 = (function (_super) {
         return _super.prototype.y.call(this);
     };
     return SubSub6;
-})(Sub6);
+}(Sub6));
 var results1 = new SubSub5();
 var results2 = new SubSub6();
 results1.x() + results1.y() + results2.y();
diff --git a/tests/baselines/reference/superAccess.js b/tests/baselines/reference/superAccess.js
index bb5a71a0b8fd7..37c6a9816a605 100644
--- a/tests/baselines/reference/superAccess.js
+++ b/tests/baselines/reference/superAccess.js
@@ -26,7 +26,7 @@ var MyBase = (function () {
     }
     MyBase.S1 = 5;
     return MyBase;
-})();
+}());
 var MyDerived = (function (_super) {
     __extends(MyDerived, _super);
     function MyDerived() {
@@ -38,4 +38,4 @@ var MyDerived = (function (_super) {
         var l5 = _super.prototype.f.call(this); // Expected => Error: Only public instance methods of the base class are accessible via the 'super' keyword
     };
     return MyDerived;
-})(MyBase);
+}(MyBase));
diff --git a/tests/baselines/reference/superAccess2.js b/tests/baselines/reference/superAccess2.js
index fd20f424ba3ba..b27d695cb31bc 100644
--- a/tests/baselines/reference/superAccess2.js
+++ b/tests/baselines/reference/superAccess2.js
@@ -36,7 +36,7 @@ var P = (function () {
     P.prototype.x = function () { };
     P.y = function () { };
     return P;
-})();
+}());
 var Q = (function (_super) {
     __extends(Q, _super);
     // Super is not allowed in constructor args
@@ -61,4 +61,4 @@ var Q = (function (_super) {
     };
     Q.yy = _super.; // error for static initializer accessing super
     return Q;
-})(P);
+}(P));
diff --git a/tests/baselines/reference/superAccessInFatArrow1.js b/tests/baselines/reference/superAccessInFatArrow1.js
index 0dc69179c92f4..3cd4e199c6218 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.js
+++ b/tests/baselines/reference/superAccessInFatArrow1.js
@@ -29,7 +29,7 @@ var test;
         A.prototype.foo = function () {
         };
         return A;
-    })();
+    }());
     test.A = A;
     var B = (function (_super) {
         __extends(B, _super);
@@ -45,6 +45,6 @@ var test;
             });
         };
         return B;
-    })(A);
+    }(A));
     test.B = B;
 })(test || (test = {}));
diff --git a/tests/baselines/reference/superCallArgsMustMatch.js b/tests/baselines/reference/superCallArgsMustMatch.js
index 3369cf7e8df3e..9dcdbda8e31ae 100644
--- a/tests/baselines/reference/superCallArgsMustMatch.js
+++ b/tests/baselines/reference/superCallArgsMustMatch.js
@@ -36,7 +36,7 @@ var T5 = (function () {
         this.bar = bar;
     }
     return T5;
-})();
+}());
 var T6 = (function (_super) {
     __extends(T6, _super);
     function T6() {
@@ -46,4 +46,4 @@ var T6 = (function (_super) {
         var x = this.foo;
     }
     return T6;
-})(T5);
+}(T5));
diff --git a/tests/baselines/reference/superCallAssignResult.js b/tests/baselines/reference/superCallAssignResult.js
index 24a198e34205b..7002f94eb7d45 100644
--- a/tests/baselines/reference/superCallAssignResult.js
+++ b/tests/baselines/reference/superCallAssignResult.js
@@ -20,7 +20,7 @@ var E = (function () {
     function E(arg) {
     }
     return E;
-})();
+}());
 var H = (function (_super) {
     __extends(H, _super);
     function H() {
@@ -28,4 +28,4 @@ var H = (function (_super) {
         x = 5;
     }
     return H;
-})(E);
+}(E));
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
index d59f6f5a5786e..50830480b1a47 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
@@ -23,4 +23,4 @@ var D = (function (_super) {
         _super.call(this);
     }
     return D;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
index a3d5d42c822ce..ef77098588896 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
@@ -22,4 +22,4 @@ var D = (function (_super) {
         _super.call(this);
     }
     return D;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
index 155258861bfc3..ebb70023b538a 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
@@ -21,11 +21,11 @@ var A = (function () {
         this.map = map;
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.call(this, function (value) { return String(value); });
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
index 37883b9921ace..d619343ba142b 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
@@ -21,11 +21,11 @@ var A = (function () {
         this.map = map;
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.call(this, function (value) { return String(value); });
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
index dbd4528c39f47..e9ee84be15224 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
@@ -21,11 +21,11 @@ var A = (function () {
         this.map = map;
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         _super.call(this, function (value) { return String(value); });
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js b/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js
index 7818aed7ff855..d793e9bb2ae0b 100644
--- a/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js
+++ b/tests/baselines/reference/superCallFromClassThatHasNoBaseType1.js
@@ -16,10 +16,10 @@ var A = (function () {
         this.map = map;
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
         _super.call(this, function (value) { return String(value); });
     }
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/superCallInConstructorWithNoBaseType.js b/tests/baselines/reference/superCallInConstructorWithNoBaseType.js
index 8d24fc45c2902..9b0f63ed8710e 100644
--- a/tests/baselines/reference/superCallInConstructorWithNoBaseType.js
+++ b/tests/baselines/reference/superCallInConstructorWithNoBaseType.js
@@ -17,11 +17,11 @@ var C = (function () {
         _super.call(this); // error
     }
     return C;
-})();
+}());
 var D = (function () {
     function D(x) {
         this.x = x;
         _super.call(this); // error
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/superCallInNonStaticMethod.js b/tests/baselines/reference/superCallInNonStaticMethod.js
index 7de6a100451a5..3ff07edf4c9ef 100644
--- a/tests/baselines/reference/superCallInNonStaticMethod.js
+++ b/tests/baselines/reference/superCallInNonStaticMethod.js
@@ -62,7 +62,7 @@ var Doing = (function () {
     Doing.prototype.instanceMethod = function () {
     };
     return Doing;
-})();
+}());
 var Other = (function (_super) {
     __extends(Other, _super);
     function Other() {
@@ -107,4 +107,4 @@ var Other = (function (_super) {
         configurable: true
     });
     return Other;
-})(Doing);
+}(Doing));
diff --git a/tests/baselines/reference/superCallInStaticMethod.js b/tests/baselines/reference/superCallInStaticMethod.js
index 9978773739f4e..91558e47d3f88 100644
--- a/tests/baselines/reference/superCallInStaticMethod.js
+++ b/tests/baselines/reference/superCallInStaticMethod.js
@@ -58,7 +58,7 @@ var Doing = (function () {
     Doing.staticMethod = function () {
     };
     return Doing;
-})();
+}());
 var Other = (function (_super) {
     __extends(Other, _super);
     function Other() {
@@ -104,4 +104,4 @@ var Other = (function (_super) {
         _super.staticMethod.call(this);
     };
     return Other;
-})(Doing);
+}(Doing));
diff --git a/tests/baselines/reference/superCallInsideClassDeclaration.js b/tests/baselines/reference/superCallInsideClassDeclaration.js
index 6d16aceb247f2..e677c426e0241 100644
--- a/tests/baselines/reference/superCallInsideClassDeclaration.js
+++ b/tests/baselines/reference/superCallInsideClassDeclaration.js
@@ -26,12 +26,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -41,7 +41,7 @@ var B = (function (_super) {
                 _super.call(this);
             }
             return D;
-        })(C);
+        }(C));
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/superCallInsideClassExpression.js b/tests/baselines/reference/superCallInsideClassExpression.js
index ea24003d9b73c..ee373f69f4600 100644
--- a/tests/baselines/reference/superCallInsideClassExpression.js
+++ b/tests/baselines/reference/superCallInsideClassExpression.js
@@ -26,12 +26,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -41,7 +41,7 @@ var B = (function (_super) {
                 _super.call(this);
             }
             return class_1;
-        })(C);
+        }(C));
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/superCallInsideObjectLiteralExpression.js b/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
index 60513cf43eeb5..3f9a0a9ce9c87 100644
--- a/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
+++ b/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
@@ -24,7 +24,7 @@ var A = (function () {
     A.prototype.foo = function () {
     };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -33,4 +33,4 @@ var B = (function (_super) {
         };
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/superCallOutsideConstructor.js b/tests/baselines/reference/superCallOutsideConstructor.js
index c2152e13db085..202ed531a10c2 100644
--- a/tests/baselines/reference/superCallOutsideConstructor.js
+++ b/tests/baselines/reference/superCallOutsideConstructor.js
@@ -33,7 +33,7 @@ var C = (function () {
     }
     C.prototype.foo = function () { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -47,5 +47,5 @@ var D = (function (_super) {
         };
     }
     return D;
-})(C);
+}(C));
 var d = new D();
diff --git a/tests/baselines/reference/superCallParameterContextualTyping1.js b/tests/baselines/reference/superCallParameterContextualTyping1.js
index b7508e4cd7dab..5bfe3927a512e 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping1.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping1.js
@@ -23,7 +23,7 @@ var A = (function () {
         this.map = map;
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     // Ensure 'value' is of type 'number (and not '{}') by using its 'toExponential()' method.
@@ -31,4 +31,4 @@ var B = (function (_super) {
         _super.call(this, function (value) { return String(value.toExponential()); });
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/superCallParameterContextualTyping2.js b/tests/baselines/reference/superCallParameterContextualTyping2.js
index 996e0374c7f5a..539ecbed065e4 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping2.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping2.js
@@ -22,7 +22,7 @@ var A = (function () {
         this.map = map;
     }
     return A;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     // Ensure 'value' is not of type 'any' by invoking it with type arguments.
@@ -30,4 +30,4 @@ var C = (function (_super) {
         _super.call(this, function (value) { return String(value()); });
     }
     return C;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/superCallParameterContextualTyping3.js b/tests/baselines/reference/superCallParameterContextualTyping3.js
index 6f1311e58ab8a..d35a1707bb74c 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping3.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping3.js
@@ -43,7 +43,7 @@ var CBase = (function () {
     CBase.prototype.foo = function (param) {
     };
     return CBase;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
@@ -63,4 +63,4 @@ var C = (function (_super) {
         });
     }
     return C;
-})(CBase);
+}(CBase));
diff --git a/tests/baselines/reference/superCallWithMissingBaseClass.js b/tests/baselines/reference/superCallWithMissingBaseClass.js
index 101e709653e23..7758bcfd89d99 100644
--- a/tests/baselines/reference/superCallWithMissingBaseClass.js
+++ b/tests/baselines/reference/superCallWithMissingBaseClass.js
@@ -27,4 +27,4 @@ var Foo = (function (_super) {
         return _super.m2.call(this);
     };
     return Foo;
-})(Bar);
+}(Bar));
diff --git a/tests/baselines/reference/superCalls.js b/tests/baselines/reference/superCalls.js
index bd54ba34b5673..ae8327ec20022 100644
--- a/tests/baselines/reference/superCalls.js
+++ b/tests/baselines/reference/superCalls.js
@@ -41,7 +41,7 @@ var Base = (function () {
         this.x = 43;
     }
     return Base;
-})();
+}());
 function v() { }
 var Derived = (function (_super) {
     __extends(Derived, _super);
@@ -54,12 +54,12 @@ var Derived = (function (_super) {
         var p = v();
     }
     return Derived;
-})(Base);
+}(Base));
 var OtherBase = (function () {
     function OtherBase() {
     }
     return OtherBase;
-})();
+}());
 var OtherDerived = (function (_super) {
     __extends(OtherDerived, _super);
     function OtherDerived() {
@@ -67,4 +67,4 @@ var OtherDerived = (function (_super) {
         _super.call(this);
     }
     return OtherDerived;
-})(OtherBase);
+}(OtherBase));
diff --git a/tests/baselines/reference/superCallsInConstructor.js b/tests/baselines/reference/superCallsInConstructor.js
index c238808b959ea..434f730c76b82 100644
--- a/tests/baselines/reference/superCallsInConstructor.js
+++ b/tests/baselines/reference/superCallsInConstructor.js
@@ -32,12 +32,12 @@ var C = (function () {
     C.prototype.foo = function () { };
     C.prototype.bar = function () { };
     return C;
-})();
+}());
 var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived = (function (_super) {
     __extends(Derived, _super);
     function Derived() {
@@ -52,4 +52,4 @@ var Derived = (function (_super) {
         }
     }
     return Derived;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/superErrors.js b/tests/baselines/reference/superErrors.js
index 3a3de509120ef..0208e720b0c17 100644
--- a/tests/baselines/reference/superErrors.js
+++ b/tests/baselines/reference/superErrors.js
@@ -71,7 +71,7 @@ var User = (function () {
         //console.log("Hello, " + this.name);
     };
     return User;
-})();
+}());
 var RegisteredUser = (function (_super) {
     __extends(RegisteredUser, _super);
     function RegisteredUser() {
@@ -106,4 +106,4 @@ var RegisteredUser = (function (_super) {
         var y = function () { return function () { return function () { return _super.; }; }; };
     };
     return RegisteredUser;
-})(User);
+}(User));
diff --git a/tests/baselines/reference/superInCatchBlock1.js b/tests/baselines/reference/superInCatchBlock1.js
index cf4c69c7b61ba..9d5cb1affdcaa 100644
--- a/tests/baselines/reference/superInCatchBlock1.js
+++ b/tests/baselines/reference/superInCatchBlock1.js
@@ -24,7 +24,7 @@ var A = (function () {
     }
     A.prototype.m = function () { };
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
@@ -38,4 +38,4 @@ var B = (function (_super) {
         }
     };
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/superInConstructorParam1.js b/tests/baselines/reference/superInConstructorParam1.js
index 7c0cc7bf40d79..9c3c11d105ce1 100644
--- a/tests/baselines/reference/superInConstructorParam1.js
+++ b/tests/baselines/reference/superInConstructorParam1.js
@@ -23,11 +23,11 @@ var B = (function () {
         return 0;
     };
     return B;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C(a) {
         if (a === void 0) { a = _super.prototype.foo.call(this); }
     }
     return C;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/superInLambdas.js b/tests/baselines/reference/superInLambdas.js
index 89d5798f88209..b0940b1d53809 100644
--- a/tests/baselines/reference/superInLambdas.js
+++ b/tests/baselines/reference/superInLambdas.js
@@ -81,7 +81,7 @@ var User = (function () {
         //console.log("Hello, " + this.name);
     };
     return User;
-})();
+}());
 var RegisteredUser = (function (_super) {
     __extends(RegisteredUser, _super);
     function RegisteredUser() {
@@ -101,7 +101,7 @@ var RegisteredUser = (function (_super) {
         var x = function () { return _super.prototype.sayHello.call(_this); };
     };
     return RegisteredUser;
-})(User);
+}(User));
 var RegisteredUser2 = (function (_super) {
     __extends(RegisteredUser2, _super);
     function RegisteredUser2() {
@@ -117,7 +117,7 @@ var RegisteredUser2 = (function (_super) {
         var x = function () { return function () { return function () { return _super.prototype.sayHello.call(_this); }; }; };
     };
     return RegisteredUser2;
-})(User);
+}(User));
 var RegisteredUser3 = (function (_super) {
     __extends(RegisteredUser3, _super);
     function RegisteredUser3() {
@@ -133,7 +133,7 @@ var RegisteredUser3 = (function (_super) {
         var superName = function () { return function () { return function () { return _super.prototype.name; }; }; };
     };
     return RegisteredUser3;
-})(User);
+}(User));
 var RegisteredUser4 = (function (_super) {
     __extends(RegisteredUser4, _super);
     function RegisteredUser4() {
@@ -149,4 +149,4 @@ var RegisteredUser4 = (function (_super) {
         var x = function () { return function () { return _super.prototype.; }; };
     };
     return RegisteredUser4;
-})(User);
+}(User));
diff --git a/tests/baselines/reference/superNewCall1.js b/tests/baselines/reference/superNewCall1.js
index aa25e65e14dbe..01ae169b598d5 100644
--- a/tests/baselines/reference/superNewCall1.js
+++ b/tests/baselines/reference/superNewCall1.js
@@ -23,11 +23,11 @@ var A = (function () {
         this.map = map;
     }
     return A;
-})();
+}());
 var B = (function (_super) {
     __extends(B, _super);
     function B() {
         new _super.prototype(function (value) { return String(value); });
     }
     return B;
-})(A);
+}(A));
diff --git a/tests/baselines/reference/superPropertyAccess.js b/tests/baselines/reference/superPropertyAccess.js
index 95dbb2f94e0e6..0e1e878344860 100644
--- a/tests/baselines/reference/superPropertyAccess.js
+++ b/tests/baselines/reference/superPropertyAccess.js
@@ -57,7 +57,7 @@ var MyBase = (function () {
         configurable: true
     });
     return MyBase;
-})();
+}());
 var MyDerived = (function (_super) {
     __extends(MyDerived, _super);
     function MyDerived() {
@@ -76,4 +76,4 @@ var MyDerived = (function (_super) {
         var z = _super.prototype.value; // Should error, instance data property not a public instance member function
     };
     return MyDerived;
-})(MyBase);
+}(MyBase));
diff --git a/tests/baselines/reference/superPropertyAccess1.js b/tests/baselines/reference/superPropertyAccess1.js
index 748331af95f39..4df9398024c84 100644
--- a/tests/baselines/reference/superPropertyAccess1.js
+++ b/tests/baselines/reference/superPropertyAccess1.js
@@ -46,7 +46,7 @@ var C = (function () {
     });
     C.prototype.bar = function () { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -68,4 +68,4 @@ var D = (function (_super) {
         configurable: true
     });
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/superPropertyAccess2.js b/tests/baselines/reference/superPropertyAccess2.js
index dccd4717ee0bc..ec74a2ea0694b 100644
--- a/tests/baselines/reference/superPropertyAccess2.js
+++ b/tests/baselines/reference/superPropertyAccess2.js
@@ -46,7 +46,7 @@ var C = (function () {
     });
     C.bar = function () { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -68,4 +68,4 @@ var D = (function (_super) {
         configurable: true
     });
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/superPropertyAccessNoError.js b/tests/baselines/reference/superPropertyAccessNoError.js
index 44a6910a3865b..a9d2f88738eef 100644
--- a/tests/baselines/reference/superPropertyAccessNoError.js
+++ b/tests/baselines/reference/superPropertyAccessNoError.js
@@ -82,7 +82,7 @@ var SomeBaseClass = (function () {
         return 3;
     };
     return SomeBaseClass;
-})();
+}());
 var SomeDerivedClass = (function (_super) {
     __extends(SomeDerivedClass, _super);
     function SomeDerivedClass() {
@@ -127,4 +127,4 @@ var SomeDerivedClass = (function (_super) {
         configurable: true
     });
     return SomeDerivedClass;
-})(SomeBaseClass);
+}(SomeBaseClass));
diff --git a/tests/baselines/reference/superSymbolIndexedAccess5.js b/tests/baselines/reference/superSymbolIndexedAccess5.js
index 64a8ac5094c54..5bc46dbaed5ee 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess5.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess5.js
@@ -27,7 +27,7 @@ var Foo = (function () {
         return 0;
     };
     return Foo;
-})();
+}());
 var Bar = (function (_super) {
     __extends(Bar, _super);
     function Bar() {
@@ -37,4 +37,4 @@ var Bar = (function (_super) {
         return _super.prototype[symbol]();
     };
     return Bar;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/superSymbolIndexedAccess6.js b/tests/baselines/reference/superSymbolIndexedAccess6.js
index e014cf47c1aef..417edd9c33840 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess6.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess6.js
@@ -27,7 +27,7 @@ var Foo = (function () {
         return 0;
     };
     return Foo;
-})();
+}());
 var Bar = (function (_super) {
     __extends(Bar, _super);
     function Bar() {
@@ -37,4 +37,4 @@ var Bar = (function (_super) {
         return _super[symbol]();
     };
     return Bar;
-})(Foo);
+}(Foo));
diff --git a/tests/baselines/reference/superWithGenericSpecialization.js b/tests/baselines/reference/superWithGenericSpecialization.js
index 3d1ea0f77a964..a54ee1bbcbc94 100644
--- a/tests/baselines/reference/superWithGenericSpecialization.js
+++ b/tests/baselines/reference/superWithGenericSpecialization.js
@@ -24,14 +24,14 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.call(this); // uses the type parameter type of the base class, ie string
     }
     return D;
-})(C);
+}(C));
 var d;
 var r = d.x;
 var r2 = d.y;
diff --git a/tests/baselines/reference/superWithGenerics.js b/tests/baselines/reference/superWithGenerics.js
index 482c7ba0694aa..b4fe56bee4c0a 100644
--- a/tests/baselines/reference/superWithGenerics.js
+++ b/tests/baselines/reference/superWithGenerics.js
@@ -23,4 +23,4 @@ var D = (function (_super) {
         _super.call(this);
     }
     return D;
-})(B);
+}(B));
diff --git a/tests/baselines/reference/superWithTypeArgument.js b/tests/baselines/reference/superWithTypeArgument.js
index 6d5690cd689ec..766b5f7920e28 100644
--- a/tests/baselines/reference/superWithTypeArgument.js
+++ b/tests/baselines/reference/superWithTypeArgument.js
@@ -19,11 +19,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.prototype..call(this);
     }
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/superWithTypeArgument2.js b/tests/baselines/reference/superWithTypeArgument2.js
index 588094cd864d3..e0d2a40633f32 100644
--- a/tests/baselines/reference/superWithTypeArgument2.js
+++ b/tests/baselines/reference/superWithTypeArgument2.js
@@ -19,11 +19,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D(x) {
         _super.prototype..call(this, x);
     }
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/superWithTypeArgument3.js b/tests/baselines/reference/superWithTypeArgument3.js
index 8f0ba6c08612e..586dc595b3976 100644
--- a/tests/baselines/reference/superWithTypeArgument3.js
+++ b/tests/baselines/reference/superWithTypeArgument3.js
@@ -24,7 +24,7 @@ var C = (function () {
     }
     C.prototype.bar = function (x) { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -34,4 +34,4 @@ var D = (function (_super) {
         _super.prototype.bar.call(this, null);
     };
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js
index d2f240b766d1e..be70ee33183ff 100644
--- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js
+++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.js
@@ -53,7 +53,7 @@ var F = (function () {
     }
     F.prototype.test = function () { return ""; };
     return F;
-})();
+}());
 var SuperObjectTest = (function (_super) {
     __extends(SuperObjectTest, _super);
     function SuperObjectTest() {
@@ -67,4 +67,4 @@ var SuperObjectTest = (function (_super) {
         };
     };
     return SuperObjectTest;
-})(F);
+}(F));
diff --git a/tests/baselines/reference/switchAssignmentCompat.js b/tests/baselines/reference/switchAssignmentCompat.js
index 1e6792ee378a5..c88b07059a213 100644
--- a/tests/baselines/reference/switchAssignmentCompat.js
+++ b/tests/baselines/reference/switchAssignmentCompat.js
@@ -11,7 +11,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 switch (0) {
     case Foo: break; // Error expected
 }
diff --git a/tests/baselines/reference/switchCasesExpressionTypeMismatch.js b/tests/baselines/reference/switchCasesExpressionTypeMismatch.js
index ca354779be1a5..ba929691d2536 100644
--- a/tests/baselines/reference/switchCasesExpressionTypeMismatch.js
+++ b/tests/baselines/reference/switchCasesExpressionTypeMismatch.js
@@ -23,7 +23,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 switch (0) {
     case Foo: break; // Error
     case "sss": break; // Error
diff --git a/tests/baselines/reference/switchStatements.js b/tests/baselines/reference/switchStatements.js
index 39a4b2c901d81..093a7fb2f2c19 100644
--- a/tests/baselines/reference/switchStatements.js
+++ b/tests/baselines/reference/switchStatements.js
@@ -94,14 +94,14 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         _super.apply(this, arguments);
     }
     return D;
-})(C);
+}(C));
 switch (new C()) {
     case new D():
     case { id: 12, name: '' }:
diff --git a/tests/baselines/reference/systemModule17.js b/tests/baselines/reference/systemModule17.js
index 7ef4d441823c0..6daa119d2873f 100644
--- a/tests/baselines/reference/systemModule17.js
+++ b/tests/baselines/reference/systemModule17.js
@@ -52,7 +52,7 @@ System.register([], function(exports_1) {
                 function A() {
                 }
                 return A;
-            })();
+            }());
             exports_1("A", A);
         }
     }
diff --git a/tests/baselines/reference/systemModule3.js b/tests/baselines/reference/systemModule3.js
index c7aeb7f508c31..dbef74f30364d 100644
--- a/tests/baselines/reference/systemModule3.js
+++ b/tests/baselines/reference/systemModule3.js
@@ -50,7 +50,7 @@ System.register([], function(exports_1) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             exports_1("default", C);
         }
     }
@@ -66,7 +66,7 @@ System.register([], function(exports_1) {
                 function default_1() {
                 }
                 return default_1;
-            })();
+            }());
             exports_1("default", default_1);
         }
     }
diff --git a/tests/baselines/reference/systemModule6.js b/tests/baselines/reference/systemModule6.js
index 7d93ee1df032a..51c8fbc68fb85 100644
--- a/tests/baselines/reference/systemModule6.js
+++ b/tests/baselines/reference/systemModule6.js
@@ -20,7 +20,7 @@ System.register([], function(exports_1) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             exports_1("C", C);
         }
     }
diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.js b/tests/baselines/reference/systemModuleDeclarationMerging.js
index f11c5d9a360cd..5ed029a769af7 100644
--- a/tests/baselines/reference/systemModuleDeclarationMerging.js
+++ b/tests/baselines/reference/systemModuleDeclarationMerging.js
@@ -26,7 +26,7 @@ System.register([], function(exports_1) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             exports_1("C", C);
             (function (C) {
                 var x;
diff --git a/tests/baselines/reference/systemModuleExportDefault.js b/tests/baselines/reference/systemModuleExportDefault.js
index 6befe63b26766..cf1a99a4ad758 100644
--- a/tests/baselines/reference/systemModuleExportDefault.js
+++ b/tests/baselines/reference/systemModuleExportDefault.js
@@ -48,7 +48,7 @@ System.register([], function(exports_1) {
                 function default_1() {
                 }
                 return default_1;
-            })();
+            }());
             exports_1("default", default_1);
         }
     }
@@ -64,7 +64,7 @@ System.register([], function(exports_1) {
                 function C() {
                 }
                 return C;
-            })();
+            }());
             exports_1("default", C);
         }
     }
diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js
index b7ec776e483bf..ee9858a7fec83 100644
--- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js
+++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.js
@@ -25,7 +25,7 @@ System.register([], function(exports_1) {
                 function TopLevelClass() {
                 }
                 return TopLevelClass;
-            })();
+            }());
             exports_1("TopLevelClass", TopLevelClass);
             (function (TopLevelModule) {
                 var v;
@@ -40,7 +40,7 @@ System.register([], function(exports_1) {
                     function NonTopLevelClass() {
                     }
                     return NonTopLevelClass;
-                })();
+                }());
                 TopLevelModule2.NonTopLevelClass = NonTopLevelClass;
                 var NonTopLevelModule;
                 (function (NonTopLevelModule) {
diff --git a/tests/baselines/reference/systemModuleWithSuperClass.js b/tests/baselines/reference/systemModuleWithSuperClass.js
index 8b528f281ed10..fe9c2742f2dd8 100644
--- a/tests/baselines/reference/systemModuleWithSuperClass.js
+++ b/tests/baselines/reference/systemModuleWithSuperClass.js
@@ -23,7 +23,7 @@ System.register([], function(exports_1) {
                 function Foo() {
                 }
                 return Foo;
-            })();
+            }());
             exports_1("Foo", Foo);
         }
     }
@@ -50,7 +50,7 @@ System.register(['./foo'], function(exports_1) {
                     _super.apply(this, arguments);
                 }
                 return Bar;
-            })(foo_1.Foo);
+            }(foo_1.Foo));
             exports_1("Bar", Bar);
         }
     }
diff --git a/tests/baselines/reference/targetTypeBaseCalls.js b/tests/baselines/reference/targetTypeBaseCalls.js
index 41673a62efd69..d028c04d711d8 100644
--- a/tests/baselines/reference/targetTypeBaseCalls.js
+++ b/tests/baselines/reference/targetTypeBaseCalls.js
@@ -29,7 +29,7 @@ var Foo = (function () {
     function Foo(x) {
     }
     return Foo;
-})();
+}());
 foo(function (s) { s = 5; }); // Error, can’t assign number to string
 new Foo(function (s) { s = 5; }); // error, if types are applied correctly
 var Bar = (function (_super) {
@@ -38,4 +38,4 @@ var Bar = (function (_super) {
         _super.call(this, function (s) { s = 5; });
     }
     return Bar;
-})(Foo); // error, if types are applied correctly
+}(Foo)); // error, if types are applied correctly
diff --git a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.js b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.js
index 5d5f925fe69af..1ebc479593dab 100644
--- a/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.js
+++ b/tests/baselines/reference/templateStringsArrayTypeDefinedInES5Mode.js
@@ -15,7 +15,7 @@ var TemplateStringsArray = (function () {
     function TemplateStringsArray() {
     }
     return TemplateStringsArray;
-})();
+}());
 function f(x, y, z) {
 }
 f({}, 10, 10);
diff --git a/tests/baselines/reference/testContainerList.js b/tests/baselines/reference/testContainerList.js
index dca80c7fa513e..19e54a2782fc9 100644
--- a/tests/baselines/reference/testContainerList.js
+++ b/tests/baselines/reference/testContainerList.js
@@ -16,5 +16,5 @@ var A;
             this.d = d;
         }
         return C;
-    })();
+    }());
 })(A || (A = {}));
diff --git a/tests/baselines/reference/thisBinding.js b/tests/baselines/reference/thisBinding.js
index 79a27b19fd817..d8d7f5b7c0a32 100644
--- a/tests/baselines/reference/thisBinding.js
+++ b/tests/baselines/reference/thisBinding.js
@@ -34,7 +34,7 @@ var M;
             x.z; // ok 
         };
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
 var C = (function () {
@@ -43,4 +43,4 @@ var C = (function () {
     C.prototype.f = function (x) {
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/thisBinding2.js b/tests/baselines/reference/thisBinding2.js
index 76b99797e166a..142cd9db4a5a2 100644
--- a/tests/baselines/reference/thisBinding2.js
+++ b/tests/baselines/reference/thisBinding2.js
@@ -35,7 +35,7 @@ var C = (function () {
         }();
     }
     return C;
-})();
+}());
 var messenger = {
     message: "Hello World",
     start: function () {
diff --git a/tests/baselines/reference/thisCapture1.js b/tests/baselines/reference/thisCapture1.js
index 53d01b8f8ca0d..8ee3fa2fddcf6 100644
--- a/tests/baselines/reference/thisCapture1.js
+++ b/tests/baselines/reference/thisCapture1.js
@@ -22,4 +22,4 @@ var X = (function () {
         }).promise();
     };
     return X;
-})();
+}());
diff --git a/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js b/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js
index 78b06d30dd251..9aea88edf4678 100644
--- a/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js
+++ b/tests/baselines/reference/thisExpressionInCallExpressionWithTypeArguments.js
@@ -13,4 +13,4 @@ var C = (function () {
         [1, 2, 3].map(function (x) { return _this; });
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/thisExpressionOfGenericObject.js b/tests/baselines/reference/thisExpressionOfGenericObject.js
index e790050069eb0..a6cfdeb4d0743 100644
--- a/tests/baselines/reference/thisExpressionOfGenericObject.js
+++ b/tests/baselines/reference/thisExpressionOfGenericObject.js
@@ -14,4 +14,4 @@ var MyClass1 = (function () {
         (function () { return _this; });
     }
     return MyClass1;
-})();
+}());
diff --git a/tests/baselines/reference/thisInAccessors.js b/tests/baselines/reference/thisInAccessors.js
index ab52164929256..6c0b492d878be 100644
--- a/tests/baselines/reference/thisInAccessors.js
+++ b/tests/baselines/reference/thisInAccessors.js
@@ -47,7 +47,7 @@ var GetterOnly = (function () {
         configurable: true
     });
     return GetterOnly;
-})();
+}());
 // this capture only in setter
 var SetterOnly = (function () {
     function SetterOnly() {
@@ -64,7 +64,7 @@ var SetterOnly = (function () {
         configurable: true
     });
     return SetterOnly;
-})();
+}());
 // this capture only in both setter and getter
 var GetterAndSetter = (function () {
     function GetterAndSetter() {
@@ -83,4 +83,4 @@ var GetterAndSetter = (function () {
         configurable: true
     });
     return GetterAndSetter;
-})();
+}());
diff --git a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
index 03e6ddb64d93c..4b23326c7a3d8 100644
--- a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
+++ b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
@@ -19,4 +19,4 @@ var Vector = (function () {
         log(_this);
     };
     return Vector;
-})();
+}());
diff --git a/tests/baselines/reference/thisInConstructorParameter1.js b/tests/baselines/reference/thisInConstructorParameter1.js
index a489999c9551f..32d50bc1edec2 100644
--- a/tests/baselines/reference/thisInConstructorParameter1.js
+++ b/tests/baselines/reference/thisInConstructorParameter1.js
@@ -10,4 +10,4 @@ var Foo = (function () {
         if (x === void 0) { x = this.y; }
     }
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/thisInConstructorParameter2.js b/tests/baselines/reference/thisInConstructorParameter2.js
index 6d07f66becbd1..7260ecafcb98c 100644
--- a/tests/baselines/reference/thisInConstructorParameter2.js
+++ b/tests/baselines/reference/thisInConstructorParameter2.js
@@ -27,4 +27,4 @@ var P = (function () {
     };
     P.y = this;
     return P;
-})();
+}());
diff --git a/tests/baselines/reference/thisInGenericStaticMembers.js b/tests/baselines/reference/thisInGenericStaticMembers.js
index 9699941206ed3..11dc7b28081a7 100644
--- a/tests/baselines/reference/thisInGenericStaticMembers.js
+++ b/tests/baselines/reference/thisInGenericStaticMembers.js
@@ -38,7 +38,7 @@ var A = (function () {
         return this.one(source, 42);
     };
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
@@ -49,4 +49,4 @@ var B = (function () {
         return this.one(source, 42);
     };
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/thisInInnerFunctions.js b/tests/baselines/reference/thisInInnerFunctions.js
index d9ba3adfdf304..ec8a387bd1b05 100644
--- a/tests/baselines/reference/thisInInnerFunctions.js
+++ b/tests/baselines/reference/thisInInnerFunctions.js
@@ -30,7 +30,7 @@ var Foo = (function () {
         }
     };
     return Foo;
-})();
+}());
 function test() {
     var _this = this;
     var x = function () {
diff --git a/tests/baselines/reference/thisInInstanceMemberInitializer.js b/tests/baselines/reference/thisInInstanceMemberInitializer.js
index 6b7ebb8f056a2..71db30b05403d 100644
--- a/tests/baselines/reference/thisInInstanceMemberInitializer.js
+++ b/tests/baselines/reference/thisInInstanceMemberInitializer.js
@@ -14,10 +14,10 @@ var C = (function () {
         this.x = this;
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
         this.x = this;
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/thisInInvalidContexts.js b/tests/baselines/reference/thisInInvalidContexts.js
index d5ba69ff5364c..63a39b33b0e7b 100644
--- a/tests/baselines/reference/thisInInvalidContexts.js
+++ b/tests/baselines/reference/thisInInvalidContexts.js
@@ -60,12 +60,12 @@ var ErrClass1 = (function () {
     }
     ErrClass1.t = this; // Error
     return ErrClass1;
-})();
+}());
 var BaseErrClass = (function () {
     function BaseErrClass(t) {
     }
     return BaseErrClass;
-})();
+}());
 var ClassWithNoInitializer = (function (_super) {
     __extends(ClassWithNoInitializer, _super);
     //'this' in optional super call
@@ -73,7 +73,7 @@ var ClassWithNoInitializer = (function (_super) {
         _super.call(this, this); // OK
     }
     return ClassWithNoInitializer;
-})(BaseErrClass);
+}(BaseErrClass));
 var ClassWithInitializer = (function (_super) {
     __extends(ClassWithInitializer, _super);
     //'this' in required super call
@@ -82,7 +82,7 @@ var ClassWithInitializer = (function (_super) {
         this.t = 4;
     }
     return ClassWithInitializer;
-})(BaseErrClass);
+}(BaseErrClass));
 var M;
 (function (M) {
     //'this' in module variable
@@ -99,7 +99,7 @@ var ErrClass3 = (function (_super) {
         _super.apply(this, arguments);
     }
     return ErrClass3;
-})(this);
+}(this));
 //'this' as a computed enum value
 var SomeEnum;
 (function (SomeEnum) {
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
index 31a2e995a18b4..3df51877d1399 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
@@ -61,12 +61,12 @@ var ErrClass1 = (function () {
     }
     ErrClass1.t = this; // Error
     return ErrClass1;
-})();
+}());
 var BaseErrClass = (function () {
     function BaseErrClass(t) {
     }
     return BaseErrClass;
-})();
+}());
 var ClassWithNoInitializer = (function (_super) {
     __extends(ClassWithNoInitializer, _super);
     //'this' in optional super call
@@ -74,7 +74,7 @@ var ClassWithNoInitializer = (function (_super) {
         _super.call(this, this); // OK
     }
     return ClassWithNoInitializer;
-})(BaseErrClass);
+}(BaseErrClass));
 var ClassWithInitializer = (function (_super) {
     __extends(ClassWithInitializer, _super);
     //'this' in required super call
@@ -83,7 +83,7 @@ var ClassWithInitializer = (function (_super) {
         this.t = 4;
     }
     return ClassWithInitializer;
-})(BaseErrClass);
+}(BaseErrClass));
 var M;
 (function (M) {
     //'this' in module variable
@@ -100,7 +100,7 @@ var ErrClass3 = (function (_super) {
         _super.apply(this, arguments);
     }
     return ErrClass3;
-})(this);
+}(this));
 //'this' as a computed enum value
 var SomeEnum;
 (function (SomeEnum) {
diff --git a/tests/baselines/reference/thisInLambda.js b/tests/baselines/reference/thisInLambda.js
index 94c86bd5a808b..b121947ce9b95 100644
--- a/tests/baselines/reference/thisInLambda.js
+++ b/tests/baselines/reference/thisInLambda.js
@@ -29,7 +29,7 @@ var Foo = (function () {
         var f = function () { return _this.x; }; // 'this' should be type 'Foo' as well
     };
     return Foo;
-})();
+}());
 function myFn(a) { }
 var myCls = (function () {
     function myCls() {
@@ -41,4 +41,4 @@ var myCls = (function () {
         });
     }
     return myCls;
-})();
+}());
diff --git a/tests/baselines/reference/thisInObjectLiterals.js b/tests/baselines/reference/thisInObjectLiterals.js
index 79e834be15429..4e71347a366e1 100644
--- a/tests/baselines/reference/thisInObjectLiterals.js
+++ b/tests/baselines/reference/thisInObjectLiterals.js
@@ -28,7 +28,7 @@ var MyClass = (function () {
         var t;
     };
     return MyClass;
-})();
+}());
 //type of 'this' in an object literal property of a function type is Any
 var obj = {
     f: function () {
diff --git a/tests/baselines/reference/thisInOuterClassBody.js b/tests/baselines/reference/thisInOuterClassBody.js
index 0dff441bb1eed..40e4a2e2485da 100644
--- a/tests/baselines/reference/thisInOuterClassBody.js
+++ b/tests/baselines/reference/thisInOuterClassBody.js
@@ -38,4 +38,4 @@ var Foo = (function () {
     };
     Foo.y = this;
     return Foo;
-})();
+}());
diff --git a/tests/baselines/reference/thisInPropertyBoundDeclarations.js b/tests/baselines/reference/thisInPropertyBoundDeclarations.js
index e5004eed43186..0b378cec51aaf 100644
--- a/tests/baselines/reference/thisInPropertyBoundDeclarations.js
+++ b/tests/baselines/reference/thisInPropertyBoundDeclarations.js
@@ -80,7 +80,7 @@ var Bug = (function () {
         }
     ];
     return Bug;
-})();
+}());
 // Valid use of this in a property bound decl
 var A = (function () {
     function A() {
@@ -109,7 +109,7 @@ var A = (function () {
         };
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
         var _this = this;
@@ -131,4 +131,4 @@ var B = (function () {
         };
     }
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/thisInStaticMethod1.js b/tests/baselines/reference/thisInStaticMethod1.js
index 1021e32cc2080..a42415c0b62b1 100644
--- a/tests/baselines/reference/thisInStaticMethod1.js
+++ b/tests/baselines/reference/thisInStaticMethod1.js
@@ -16,5 +16,5 @@ var foo = (function () {
     };
     foo.x = 3;
     return foo;
-})();
+}());
 var x = foo.bar();
diff --git a/tests/baselines/reference/thisInStatics.js b/tests/baselines/reference/thisInStatics.js
index a7d6a5890cc73..b3f688903c685 100644
--- a/tests/baselines/reference/thisInStatics.js
+++ b/tests/baselines/reference/thisInStatics.js
@@ -26,4 +26,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/thisInSuperCall.js b/tests/baselines/reference/thisInSuperCall.js
index f7d7ca4e4fd65..a867715957fa1 100644
--- a/tests/baselines/reference/thisInSuperCall.js
+++ b/tests/baselines/reference/thisInSuperCall.js
@@ -32,14 +32,14 @@ var Base = (function () {
     function Base(x) {
     }
     return Base;
-})();
+}());
 var Foo = (function (_super) {
     __extends(Foo, _super);
     function Foo() {
         _super.call(this, this); // no error
     }
     return Foo;
-})(Base);
+}(Base));
 var Foo2 = (function (_super) {
     __extends(Foo2, _super);
     function Foo2() {
@@ -47,7 +47,7 @@ var Foo2 = (function (_super) {
         this.p = 0;
     }
     return Foo2;
-})(Base);
+}(Base));
 var Foo3 = (function (_super) {
     __extends(Foo3, _super);
     function Foo3(p) {
@@ -55,4 +55,4 @@ var Foo3 = (function (_super) {
         this.p = p;
     }
     return Foo3;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/thisInSuperCall1.js b/tests/baselines/reference/thisInSuperCall1.js
index 4ae43784fe00d..a1cfc196ac634 100644
--- a/tests/baselines/reference/thisInSuperCall1.js
+++ b/tests/baselines/reference/thisInSuperCall1.js
@@ -20,7 +20,7 @@ var Base = (function () {
     function Base(a) {
     }
     return Base;
-})();
+}());
 var Foo = (function (_super) {
     __extends(Foo, _super);
     function Foo(x) {
@@ -28,4 +28,4 @@ var Foo = (function (_super) {
         this.x = x;
     }
     return Foo;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/thisInSuperCall2.js b/tests/baselines/reference/thisInSuperCall2.js
index a9bbeda9fe798..82cae46b2d667 100644
--- a/tests/baselines/reference/thisInSuperCall2.js
+++ b/tests/baselines/reference/thisInSuperCall2.js
@@ -29,14 +29,14 @@ var Base = (function () {
     function Base(a) {
     }
     return Base;
-})();
+}());
 var Foo = (function (_super) {
     __extends(Foo, _super);
     function Foo() {
         _super.call(this, this); // no error
     }
     return Foo;
-})(Base);
+}(Base));
 var Foo2 = (function (_super) {
     __extends(Foo2, _super);
     function Foo2() {
@@ -44,4 +44,4 @@ var Foo2 = (function (_super) {
         this.x = 0;
     }
     return Foo2;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/thisInSuperCall3.js b/tests/baselines/reference/thisInSuperCall3.js
index ba27add2d9722..09ad6b705a942 100644
--- a/tests/baselines/reference/thisInSuperCall3.js
+++ b/tests/baselines/reference/thisInSuperCall3.js
@@ -22,7 +22,7 @@ var Base = (function () {
     function Base(a) {
     }
     return Base;
-})();
+}());
 var Foo = (function (_super) {
     __extends(Foo, _super);
     function Foo() {
@@ -30,4 +30,4 @@ var Foo = (function (_super) {
         this.x = 0;
     }
     return Foo;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/thisTypeAndConstraints.js b/tests/baselines/reference/thisTypeAndConstraints.js
index d62ebe6917cb2..3800b8bc5e385 100644
--- a/tests/baselines/reference/thisTypeAndConstraints.js
+++ b/tests/baselines/reference/thisTypeAndConstraints.js
@@ -30,7 +30,7 @@ var A = (function () {
         return this;
     };
     return A;
-})();
+}());
 function f(x) {
     function g(x) {
         x = x.self();
@@ -47,4 +47,4 @@ var B = (function () {
         x = x.self();
     };
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/thisTypeErrors.js b/tests/baselines/reference/thisTypeErrors.js
index 677feb374e155..f246b80f4f4f6 100644
--- a/tests/baselines/reference/thisTypeErrors.js
+++ b/tests/baselines/reference/thisTypeErrors.js
@@ -68,7 +68,7 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
@@ -77,7 +77,7 @@ var C2 = (function () {
     };
     C2.y = undefined;
     return C2;
-})();
+}());
 var N1;
 (function (N1) {
     N1.y = this;
@@ -101,4 +101,4 @@ var C3 = (function () {
         };
     };
     return C3;
-})();
+}());
diff --git a/tests/baselines/reference/thisTypeErrors2.js b/tests/baselines/reference/thisTypeErrors2.js
index f48d0874e53e4..4546dcd219987 100644
--- a/tests/baselines/reference/thisTypeErrors2.js
+++ b/tests/baselines/reference/thisTypeErrors2.js
@@ -19,12 +19,12 @@ var Base = (function () {
     function Base(a) {
     }
     return Base;
-})();
+}());
 var Generic = (function () {
     function Generic() {
     }
     return Generic;
-})();
+}());
 var Derived = (function () {
     function Derived(host) {
         this.host = host;
@@ -32,4 +32,4 @@ var Derived = (function () {
         this.n = 12;
     }
     return Derived;
-})();
+}());
diff --git a/tests/baselines/reference/thisTypeInClasses.js b/tests/baselines/reference/thisTypeInClasses.js
index 52ad452aa5666..c6790b3d52d79 100644
--- a/tests/baselines/reference/thisTypeInClasses.js
+++ b/tests/baselines/reference/thisTypeInClasses.js
@@ -56,17 +56,17 @@ var C1 = (function () {
     }
     C1.prototype.f = function (x) { return undefined; };
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C5 = (function () {
     function C5() {
     }
@@ -87,4 +87,4 @@ var C5 = (function () {
         var x2 = undefined;
     };
     return C5;
-})();
+}());
diff --git a/tests/baselines/reference/thisWhenTypeCheckFails.js b/tests/baselines/reference/thisWhenTypeCheckFails.js
index 1a3ac7b2da2cd..fee1ef2d61ea7 100644
--- a/tests/baselines/reference/thisWhenTypeCheckFails.js
+++ b/tests/baselines/reference/thisWhenTypeCheckFails.js
@@ -19,4 +19,4 @@ var c = (function () {
         };
     };
     return c;
-})();
+}());
diff --git a/tests/baselines/reference/throwInEnclosingStatements.js b/tests/baselines/reference/throwInEnclosingStatements.js
index 4d9200776e7de..83928d71bff99 100644
--- a/tests/baselines/reference/throwInEnclosingStatements.js
+++ b/tests/baselines/reference/throwInEnclosingStatements.js
@@ -84,7 +84,7 @@ var C = (function () {
         throw this.value;
     };
     return C;
-})();
+}());
 var aa = {
     id: 12,
     biz: function () {
diff --git a/tests/baselines/reference/throwStatements.js b/tests/baselines/reference/throwStatements.js
index 556ebc55e37b4..eb25d0a895bc3 100644
--- a/tests/baselines/reference/throwStatements.js
+++ b/tests/baselines/reference/throwStatements.js
@@ -92,12 +92,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 function F(x) { return 42; }
 var M;
 (function (M) {
@@ -105,7 +105,7 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     M.A = A;
     function F2(x) { return x.toString(); }
     M.F2 = F2;
diff --git a/tests/baselines/reference/tooManyTypeParameters1.js b/tests/baselines/reference/tooManyTypeParameters1.js
index 892731cbd4337..085a6bd13e3d1 100644
--- a/tests/baselines/reference/tooManyTypeParameters1.js
+++ b/tests/baselines/reference/tooManyTypeParameters1.js
@@ -20,6 +20,6 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = new C();
 var i;
diff --git a/tests/baselines/reference/topLevel.js b/tests/baselines/reference/topLevel.js
index 528ecb583816d..1908ab8c729cb 100644
--- a/tests/baselines/reference/topLevel.js
+++ b/tests/baselines/reference/topLevel.js
@@ -42,7 +42,7 @@ var Point = (function () {
         return ("(" + this.x + "," + this.y + ")");
     };
     return Point;
-})();
+}());
 var result = "";
 result += (new Point(3, 4).move(2, 2));
 var M;
diff --git a/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js b/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js
index 7dd59ee840e33..8041025f66ab0 100644
--- a/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js
+++ b/tests/baselines/reference/trailingCommaInHeterogenousArrayLiteral1.js
@@ -20,4 +20,4 @@ var arrTest = (function () {
         this.test([1, 2, "hi", 5]);
     };
     return arrTest;
-})();
+}());
diff --git a/tests/baselines/reference/transitiveTypeArgumentInference1.js b/tests/baselines/reference/transitiveTypeArgumentInference1.js
index 96d14dd46053d..3f7aed892e12e 100644
--- a/tests/baselines/reference/transitiveTypeArgumentInference1.js
+++ b/tests/baselines/reference/transitiveTypeArgumentInference1.js
@@ -19,5 +19,5 @@ var C = (function () {
     function C(p) {
     }
     return C;
-})();
+}());
 var c = new C(i);
diff --git a/tests/baselines/reference/tsxAttributeResolution10.js b/tests/baselines/reference/tsxAttributeResolution10.js
index e0bb6d8efc18b..798bbb4c7af0d 100644
--- a/tests/baselines/reference/tsxAttributeResolution10.js
+++ b/tests/baselines/reference/tsxAttributeResolution10.js
@@ -40,7 +40,7 @@ define(["require", "exports"], function (require, exports) {
         MyComponent.prototype.render = function () {
         };
         return MyComponent;
-    })();
+    }());
     exports.MyComponent = MyComponent;
     // Should be an error
     <MyComponent bar='world'/>;
diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js
index 3879372a6728d..cd6946636a63f 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.js
+++ b/tests/baselines/reference/tsxAttributeResolution9.js
@@ -36,7 +36,7 @@ define(["require", "exports"], function (require, exports) {
         MyComponent.prototype.render = function () {
         };
         return MyComponent;
-    })();
+    }());
     exports.MyComponent = MyComponent;
     <MyComponent foo="bar"/>; // ok  
     <MyComponent foo={0}/>; // should be an error
diff --git a/tests/baselines/reference/tsxElementResolution.js b/tests/baselines/reference/tsxElementResolution.js
index e7a4ae95e9479..fb606aa4ccc24 100644
--- a/tests/baselines/reference/tsxElementResolution.js
+++ b/tests/baselines/reference/tsxElementResolution.js
@@ -30,19 +30,19 @@ var foundFirst = (function () {
     function foundFirst() {
     }
     return foundFirst;
-})();
+}());
 var Other = (function () {
     function Other() {
     }
     return Other;
-})();
+}());
 var Dotted;
 (function (Dotted) {
     var Name = (function () {
         function Name() {
         }
         return Name;
-    })();
+    }());
     Dotted.Name = Name;
 })(Dotted || (Dotted = {}));
 // Should find the intrinsic element, not the class element
diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js
index cb1a61dd59ffa..8114c5e4be5b6 100644
--- a/tests/baselines/reference/tsxElementResolution19.js
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -28,7 +28,7 @@ define(["require", "exports"], function (require, exports) {
         function MyClass() {
         }
         return MyClass;
-    })();
+    }());
     exports.MyClass = MyClass;
 });
 //// [file2.js]
diff --git a/tests/baselines/reference/tsxEmit1.js b/tests/baselines/reference/tsxEmit1.js
index bfa78a3e96c5e..dacb3ad621ad1 100644
--- a/tests/baselines/reference/tsxEmit1.js
+++ b/tests/baselines/reference/tsxEmit1.js
@@ -67,7 +67,7 @@ var SomeClass = (function () {
         var rewrites6 = <div a={{ p: p }}></div>;
     };
     return SomeClass;
-})();
+}());
 var whitespace1 = <div>      </div>;
 var whitespace2 = <div>  {p}    </div>;
 var whitespace3 = <div>  
diff --git a/tests/baselines/reference/tsxEmit3.js b/tests/baselines/reference/tsxEmit3.js
index ccb9041e9314a..9501df4e23782 100644
--- a/tests/baselines/reference/tsxEmit3.js
+++ b/tests/baselines/reference/tsxEmit3.js
@@ -48,7 +48,7 @@ var M;
         function Foo() {
         }
         return Foo;
-    })();
+    }());
     M.Foo = Foo;
     var S;
     (function (S) {
@@ -56,7 +56,7 @@ var M;
             function Bar() {
             }
             return Bar;
-        })();
+        }());
         S.Bar = Bar;
     })(S = M.S || (M.S = {}));
 })(M || (M = {}));
diff --git a/tests/baselines/reference/tsxEmit3.sourcemap.txt b/tests/baselines/reference/tsxEmit3.sourcemap.txt
index bf03147b689be..b8fdbbfc4ba8b 100644
--- a/tests/baselines/reference/tsxEmit3.sourcemap.txt
+++ b/tests/baselines/reference/tsxEmit3.sourcemap.txt
@@ -85,7 +85,7 @@ sourceFile:file.tsx
 1->Emitted(6, 9) Source(8, 39) + SourceIndex(0)
 2 >Emitted(6, 19) Source(8, 40) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -183,7 +183,7 @@ sourceFile:file.tsx
 1->Emitted(14, 13) Source(10, 22) + SourceIndex(0)
 2 >Emitted(14, 23) Source(10, 23) + SourceIndex(0)
 ---
->>>        })();
+>>>        }());
 1 >^^^^^^^^
 2 >        ^
 3 >         
diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js
index 2830137f3b07b..29aee544b3cd9 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -48,7 +48,7 @@ var Button = (function (_super) {
         return <button>Some button</button>;
     };
     return Button;
-})(React.Component);
+}(React.Component));
 exports.Button = Button;
 //// [app.jsx]
 "use strict";
@@ -69,5 +69,5 @@ var App = (function (_super) {
         return <button_1.Button />;
     };
     return App;
-})(React.Component);
+}(React.Component));
 exports.App = App;
diff --git a/tests/baselines/reference/tsxReactEmit1.js b/tests/baselines/reference/tsxReactEmit1.js
index 5b13c463bd6e2..05781ab853054 100644
--- a/tests/baselines/reference/tsxReactEmit1.js
+++ b/tests/baselines/reference/tsxReactEmit1.js
@@ -68,7 +68,7 @@ var SomeClass = (function () {
         var rewrites6 = React.createElement("div", {a: { p: p }});
     };
     return SomeClass;
-})();
+}());
 var whitespace1 = React.createElement("div", null, "      ");
 var whitespace2 = React.createElement("div", null, "  ", p, "    ");
 var whitespace3 = React.createElement("div", null, p);
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.js b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
index 251586743efca..04d61d41218a5 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -58,7 +58,7 @@ var BigGreeter = (function (_super) {
         return <div></div>;
     };
     return BigGreeter;
-})(React.Component);
+}(React.Component));
 // OK
 var a = <Greet />;
 // OK - always valid to specify 'key'
diff --git a/tests/baselines/reference/tsxTypeErrors.js b/tests/baselines/reference/tsxTypeErrors.js
index f195a459747bd..fd28f9a5bcb63 100644
--- a/tests/baselines/reference/tsxTypeErrors.js
+++ b/tests/baselines/reference/tsxTypeErrors.js
@@ -49,7 +49,7 @@ var MyClass = (function () {
     function MyClass() {
     }
     return MyClass;
-})();
+}());
 // Let's use it
 // TODO: Error on missing 'reqd'
 var b1 = <MyClass reqd={true}/>;
diff --git a/tests/baselines/reference/twoAccessorsWithSameName.js b/tests/baselines/reference/twoAccessorsWithSameName.js
index 1e447ea1205d0..0021c5ac13186 100644
--- a/tests/baselines/reference/twoAccessorsWithSameName.js
+++ b/tests/baselines/reference/twoAccessorsWithSameName.js
@@ -44,7 +44,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -54,7 +54,7 @@ var D = (function () {
         configurable: true
     });
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
@@ -67,7 +67,7 @@ var E = (function () {
         configurable: true
     });
     return E;
-})();
+}());
 var x = {
     get x() {
         return 1;
diff --git a/tests/baselines/reference/twoAccessorsWithSameName2.js b/tests/baselines/reference/twoAccessorsWithSameName2.js
index 847f83e6a7090..12210f49daeb6 100644
--- a/tests/baselines/reference/twoAccessorsWithSameName2.js
+++ b/tests/baselines/reference/twoAccessorsWithSameName2.js
@@ -26,7 +26,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -36,7 +36,7 @@ var D = (function () {
         configurable: true
     });
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
@@ -49,4 +49,4 @@ var E = (function () {
         configurable: true
     });
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/typeAliases.js b/tests/baselines/reference/typeAliases.js
index c31a52bff4503..fd63fc6ca4afd 100644
--- a/tests/baselines/reference/typeAliases.js
+++ b/tests/baselines/reference/typeAliases.js
@@ -98,7 +98,7 @@ var C7 = (function () {
     function C7() {
     }
     return C7;
-})();
+}());
 var x7;
 var x7;
 var x8;
diff --git a/tests/baselines/reference/typeAliasesForObjectTypes.js b/tests/baselines/reference/typeAliasesForObjectTypes.js
index 0b583528ade5b..0c78e7f42a4a8 100644
--- a/tests/baselines/reference/typeAliasesForObjectTypes.js
+++ b/tests/baselines/reference/typeAliasesForObjectTypes.js
@@ -20,4 +20,4 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
diff --git a/tests/baselines/reference/typeArgumentInferenceOrdering.js b/tests/baselines/reference/typeArgumentInferenceOrdering.js
index 96978bfd489eb..d6e5666b550b0 100644
--- a/tests/baselines/reference/typeArgumentInferenceOrdering.js
+++ b/tests/baselines/reference/typeArgumentInferenceOrdering.js
@@ -22,4 +22,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js b/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js
index 25ce3743fa2ad..d18181dd1dcd4 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression1.js
@@ -11,7 +11,7 @@ function foo(x) {
         function class_1() {
         }
         return class_1;
-    })(); }
+    }()); }
     return undefined;
 }
 foo((function () {
@@ -19,4 +19,4 @@ foo((function () {
     }
     class_2.prop = "hello";
     return class_2;
-})()).length;
+}())).length;
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js
index c4a7872b016d9..66da2ffbff602 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression2.js
@@ -12,7 +12,7 @@ function foo(x) {
         function class_1() {
         }
         return class_1;
-    })(); }
+    }()); }
     return undefined;
 }
 // Should not infer string because it is a static property
@@ -21,4 +21,4 @@ foo((function () {
     }
     class_2.prop = "hello";
     return class_2;
-})()).length;
+}())).length;
diff --git a/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.js b/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.js
index f3a3470e1c3b1..1fb9cf8c3cf1a 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.js
+++ b/tests/baselines/reference/typeArgumentInferenceWithClassExpression3.js
@@ -11,7 +11,7 @@ function foo(x) {
         function class_1() {
         }
         return class_1;
-    })(); }
+    }()); }
     return undefined;
 }
 foo((function () {
@@ -19,4 +19,4 @@ foo((function () {
         this.prop = "hello";
     }
     return class_2;
-})()).length;
+}())).length;
diff --git a/tests/baselines/reference/typeAssertions.js b/tests/baselines/reference/typeAssertions.js
index 3645e61f2baee..b58a46c37f6b8 100644
--- a/tests/baselines/reference/typeAssertions.js
+++ b/tests/baselines/reference/typeAssertions.js
@@ -61,19 +61,19 @@ var SomeBase = (function () {
     function SomeBase() {
     }
     return SomeBase;
-})();
+}());
 var SomeDerived = (function (_super) {
     __extends(SomeDerived, _super);
     function SomeDerived() {
         _super.apply(this, arguments);
     }
     return SomeDerived;
-})(SomeBase);
+}(SomeBase));
 var SomeOther = (function () {
     function SomeOther() {
     }
     return SomeOther;
-})();
+}());
 // Type assertion should check for assignability in either direction
 var someBase = new SomeBase();
 var someDerived = new SomeDerived();
diff --git a/tests/baselines/reference/typeCheckTypeArgument.js b/tests/baselines/reference/typeCheckTypeArgument.js
index 633eb75ed913b..e47fb18b7d6fb 100644
--- a/tests/baselines/reference/typeCheckTypeArgument.js
+++ b/tests/baselines/reference/typeCheckTypeArgument.js
@@ -20,12 +20,12 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 function bar() { }
 var Foo2 = (function () {
     function Foo2() {
     }
     Foo2.prototype.method = function () { };
     return Foo2;
-})();
+}());
 (function (a) { });
diff --git a/tests/baselines/reference/typeConstraintsWithConstructSignatures.js b/tests/baselines/reference/typeConstraintsWithConstructSignatures.js
index 749a55de9a452..b5d2574834a51 100644
--- a/tests/baselines/reference/typeConstraintsWithConstructSignatures.js
+++ b/tests/baselines/reference/typeConstraintsWithConstructSignatures.js
@@ -23,4 +23,4 @@ var C = (function () {
         var x2 = new this.data2(); // should not error
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/typeGuardFunction.js b/tests/baselines/reference/typeGuardFunction.js
index bff304682afa5..fcd6435ca1d6b 100644
--- a/tests/baselines/reference/typeGuardFunction.js
+++ b/tests/baselines/reference/typeGuardFunction.js
@@ -93,19 +93,19 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 var a;
 var b;
 // Basic
@@ -134,7 +134,7 @@ var D = (function () {
         return true;
     };
     return D;
-})();
+}());
 // Arrow function
 var f1 = function (p1) { return false; };
 // Function expressions
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.js b/tests/baselines/reference/typeGuardFunctionErrors.js
index 4923f54434556..5e69749e5821a 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionErrors.js
@@ -155,19 +155,19 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 function hasANonBooleanReturnStatement(x) {
     return '';
 }
@@ -251,7 +251,7 @@ var D = (function () {
         configurable: true
     });
     return D;
-})();
+}());
 // Reference to rest parameter
 function b4() {
     var a = [];
diff --git a/tests/baselines/reference/typeGuardFunctionGenerics.js b/tests/baselines/reference/typeGuardFunctionGenerics.js
index edf5cb97fe492..2b5bd5e826598 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.js
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.js
@@ -43,19 +43,19 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 var C = (function (_super) {
     __extends(C, _super);
     function C() {
         _super.apply(this, arguments);
     }
     return C;
-})(A);
+}(A));
 var a;
 var test1 = funA(isB);
 if (funB(retC, a)) {
diff --git a/tests/baselines/reference/typeGuardInClass.js b/tests/baselines/reference/typeGuardInClass.js
index 0ce25a7c11c13..4d3eac9d0e387 100644
--- a/tests/baselines/reference/typeGuardInClass.js
+++ b/tests/baselines/reference/typeGuardInClass.js
@@ -25,7 +25,7 @@ if (typeof x === "string") {
             var y = x;
         }
         return class_1;
-    })();
+    }());
 }
 else {
     var m = (function () {
@@ -33,5 +33,5 @@ else {
             var y = x;
         }
         return class_2;
-    })();
+    }());
 }
diff --git a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.js b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.js
index 42bab3cdbe7f0..5724c218ad33a 100644
--- a/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.js
+++ b/tests/baselines/reference/typeGuardOfFormExpr1AndExpr2.js
@@ -57,7 +57,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var cOrBool;
 var strOrNumOrBoolOrC;
diff --git a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.js b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.js
index 7e38232a73803..78a6e7732fb6f 100644
--- a/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.js
+++ b/tests/baselines/reference/typeGuardOfFormExpr1OrExpr2.js
@@ -57,7 +57,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var cOrBool;
 var strOrNumOrBoolOrC;
diff --git a/tests/baselines/reference/typeGuardOfFormInstanceOf.js b/tests/baselines/reference/typeGuardOfFormInstanceOf.js
index 1431b4b9c6090..a6881cf3cea15 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.js
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.js
@@ -82,24 +82,24 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
         _super.apply(this, arguments);
     }
     return D1;
-})(C1);
+}(C1));
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var str;
 var num;
 var strOrNum;
diff --git a/tests/baselines/reference/typeGuardOfFormIsType.js b/tests/baselines/reference/typeGuardOfFormIsType.js
index 8400aef59ada1..3f55b9d41ea9e 100644
--- a/tests/baselines/reference/typeGuardOfFormIsType.js
+++ b/tests/baselines/reference/typeGuardOfFormIsType.js
@@ -47,19 +47,19 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
         _super.apply(this, arguments);
     }
     return D1;
-})(C1);
+}(C1));
 var str;
 var num;
 var strOrNum;
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.js b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.js
index 3b0ead5b3c722..e9e11275d0dd5 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfBoolean.js
@@ -93,7 +93,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 ;
 var str;
 var bool;
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js
index 0e7ada149df0a..b3a3b8028ec69 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfEqualEqualHasNoEffect.js
@@ -40,7 +40,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 ;
 var strOrNum;
 var strOrBool;
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js
index 6a9851b51ab52..3c095f195071d 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNotEqualHasNoEffect.js
@@ -40,7 +40,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 ;
 var strOrNum;
 var strOrBool;
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.js b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.js
index b65ccbb882ff7..66fcff0c3870e 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfNumber.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfNumber.js
@@ -92,7 +92,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 ;
 var str;
 var bool;
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
index d1cb49941961f..b1e6ca2656627 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfOther.js
@@ -82,7 +82,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 ;
 var str;
 var bool;
diff --git a/tests/baselines/reference/typeGuardOfFormTypeOfString.js b/tests/baselines/reference/typeGuardOfFormTypeOfString.js
index 4f6652c440a73..5626396f73da9 100644
--- a/tests/baselines/reference/typeGuardOfFormTypeOfString.js
+++ b/tests/baselines/reference/typeGuardOfFormTypeOfString.js
@@ -92,7 +92,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 ;
 var str;
 var bool;
diff --git a/tests/baselines/reference/typeGuardsInClassAccessors.js b/tests/baselines/reference/typeGuardsInClassAccessors.js
index 8f487b725352f..7aeaf04300435 100644
--- a/tests/baselines/reference/typeGuardsInClassAccessors.js
+++ b/tests/baselines/reference/typeGuardsInClassAccessors.js
@@ -206,4 +206,4 @@ var ClassWithAccessors = (function () {
         configurable: true
     });
     return ClassWithAccessors;
-})();
+}());
diff --git a/tests/baselines/reference/typeGuardsInClassMethods.js b/tests/baselines/reference/typeGuardsInClassMethods.js
index cbe6dfe161ae8..f5ad4e6325d81 100644
--- a/tests/baselines/reference/typeGuardsInClassMethods.js
+++ b/tests/baselines/reference/typeGuardsInClassMethods.js
@@ -125,4 +125,4 @@ var C1 = (function () {
         num = typeof param === "string" && param.length; // string
     };
     return C1;
-})();
+}());
diff --git a/tests/baselines/reference/typeGuardsInProperties.js b/tests/baselines/reference/typeGuardsInProperties.js
index 78ad29a28b01a..72429b58ca4eb 100644
--- a/tests/baselines/reference/typeGuardsInProperties.js
+++ b/tests/baselines/reference/typeGuardsInProperties.js
@@ -48,7 +48,7 @@ var C1 = (function () {
         strOrNum = typeof this.pp3 === "string" && this.pp3; // string | number
     };
     return C1;
-})();
+}());
 var c1;
 strOrNum = typeof c1.pp2 === "string" && c1.pp2; // string | number
 strOrNum = typeof c1.pp3 === "string" && c1.pp3; // string | number
diff --git a/tests/baselines/reference/typeGuardsOnClassProperty.js b/tests/baselines/reference/typeGuardsOnClassProperty.js
index de4fcb50638da..abe031e96e672 100644
--- a/tests/baselines/reference/typeGuardsOnClassProperty.js
+++ b/tests/baselines/reference/typeGuardsOnClassProperty.js
@@ -44,7 +44,7 @@ var D = (function () {
         return typeof this.data === "string" ? this.data : this.data.join(" ");
     };
     return D;
-})();
+}());
 var o = {
     prop1: "string",
     prop2: true
diff --git a/tests/baselines/reference/typeIdentityConsidersBrands.js b/tests/baselines/reference/typeIdentityConsidersBrands.js
index 2398033c2c6a5..c3b25239024b1 100644
--- a/tests/baselines/reference/typeIdentityConsidersBrands.js
+++ b/tests/baselines/reference/typeIdentityConsidersBrands.js
@@ -37,22 +37,22 @@ var X = (function () {
     function X() {
     }
     return X;
-})();
+}());
 var Y = (function () {
     function Y() {
     }
     return Y;
-})();
+}());
 var X_1 = (function () {
     function X_1() {
     }
     return X_1;
-})();
+}());
 var Y_1 = (function () {
     function Y_1() {
     }
     return Y_1;
-})();
+}());
 function foo(arg) { }
 var a = new Y();
 var b = new X();
diff --git a/tests/baselines/reference/typeInferenceReturnTypeCallback.js b/tests/baselines/reference/typeInferenceReturnTypeCallback.js
index 1368366f94fb2..6de0cb5524c81 100644
--- a/tests/baselines/reference/typeInferenceReturnTypeCallback.js
+++ b/tests/baselines/reference/typeInferenceReturnTypeCallback.js
@@ -29,7 +29,7 @@ var Nil = (function () {
         return null;
     };
     return Nil;
-})();
+}());
 var Cons = (function () {
     function Cons() {
     }
@@ -42,4 +42,4 @@ var Cons = (function () {
         return null;
     };
     return Cons;
-})();
+}());
diff --git a/tests/baselines/reference/typeMatch1.js b/tests/baselines/reference/typeMatch1.js
index 9f62a9958b4f1..f78cb04f28538 100644
--- a/tests/baselines/reference/typeMatch1.js
+++ b/tests/baselines/reference/typeMatch1.js
@@ -35,12 +35,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 var x6 = new C();
 var x7 = new D();
 x6 = x7;
diff --git a/tests/baselines/reference/typeMatch2.js b/tests/baselines/reference/typeMatch2.js
index c4550750ca23e..57ba67752e239 100644
--- a/tests/baselines/reference/typeMatch2.js
+++ b/tests/baselines/reference/typeMatch2.js
@@ -61,14 +61,14 @@ var Animal = (function () {
     function Animal() {
     }
     return Animal;
-})();
+}());
 var Giraffe = (function (_super) {
     __extends(Giraffe, _super);
     function Giraffe() {
         _super.apply(this, arguments);
     }
     return Giraffe;
-})(Animal);
+}(Animal));
 function f2() {
     var a = new Animal();
     var g = new Giraffe();
diff --git a/tests/baselines/reference/typeName1.js b/tests/baselines/reference/typeName1.js
index 4448e9cb8a883..3d65ccd6d0010 100644
--- a/tests/baselines/reference/typeName1.js
+++ b/tests/baselines/reference/typeName1.js
@@ -32,7 +32,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var x1 = 3;
 var x2 = 3;
 var x3 = 3;
diff --git a/tests/baselines/reference/typeOfPrototype.js b/tests/baselines/reference/typeOfPrototype.js
index 8ab4392438e14..3e8b31869361c 100644
--- a/tests/baselines/reference/typeOfPrototype.js
+++ b/tests/baselines/reference/typeOfPrototype.js
@@ -13,5 +13,5 @@ var Foo = (function () {
     }
     Foo.bar = '';
     return Foo;
-})();
+}());
 Foo.prototype.bar = undefined; // Should be OK
diff --git a/tests/baselines/reference/typeOfSuperCall.js b/tests/baselines/reference/typeOfSuperCall.js
index 72cdd7d528ebd..94215d4ae1bf9 100644
--- a/tests/baselines/reference/typeOfSuperCall.js
+++ b/tests/baselines/reference/typeOfSuperCall.js
@@ -18,11 +18,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
         var x = _super.call(this);
     }
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/typeOfThis.js b/tests/baselines/reference/typeOfThis.js
index 7de34712e156a..c1febeae4e4d8 100644
--- a/tests/baselines/reference/typeOfThis.js
+++ b/tests/baselines/reference/typeOfThis.js
@@ -248,7 +248,7 @@ var MyTestClass = (function () {
         configurable: true
     });
     return MyTestClass;
-})();
+}());
 var MyGenericTestClass = (function () {
     function MyGenericTestClass() {
         var _this = this;
@@ -318,7 +318,7 @@ var MyGenericTestClass = (function () {
         configurable: true
     });
     return MyGenericTestClass;
-})();
+}());
 //type of 'this' in a function declaration param list is Any
 function fn(s) {
     if (s === void 0) { s = this; }
diff --git a/tests/baselines/reference/typeOfThisInAccessor.js b/tests/baselines/reference/typeOfThisInAccessor.js
index 34d1bfaf2d02f..eff26c713d716 100644
--- a/tests/baselines/reference/typeOfThisInAccessor.js
+++ b/tests/baselines/reference/typeOfThisInAccessor.js
@@ -52,7 +52,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -73,7 +73,7 @@ var D = (function () {
         configurable: true
     });
     return D;
-})();
+}());
 var x = {
     get a() {
         var r3 = this; // any
diff --git a/tests/baselines/reference/typeOfThisInConstructorParamList.js b/tests/baselines/reference/typeOfThisInConstructorParamList.js
index feabb8dbd1326..bee1710ca58f8 100644
--- a/tests/baselines/reference/typeOfThisInConstructorParamList.js
+++ b/tests/baselines/reference/typeOfThisInConstructorParamList.js
@@ -14,4 +14,4 @@ var ErrClass = (function () {
         if (f === void 0) { f = this; }
     }
     return ErrClass;
-})();
+}());
diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.js b/tests/baselines/reference/typeOfThisInFunctionExpression.js
index 83bad9e6d1a30..9fafdcd11b619 100644
--- a/tests/baselines/reference/typeOfThisInFunctionExpression.js
+++ b/tests/baselines/reference/typeOfThisInFunctionExpression.js
@@ -71,7 +71,7 @@ var C = (function () {
         };
     }
     return C;
-})();
+}());
 var M;
 (function (M) {
     function fn() {
diff --git a/tests/baselines/reference/typeOfThisInInstanceMember.js b/tests/baselines/reference/typeOfThisInInstanceMember.js
index 5e4b4f2970d40..fce84290d5e38 100644
--- a/tests/baselines/reference/typeOfThisInInstanceMember.js
+++ b/tests/baselines/reference/typeOfThisInInstanceMember.js
@@ -52,7 +52,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var c;
 // all ok
 var r = c.x;
diff --git a/tests/baselines/reference/typeOfThisInInstanceMember2.js b/tests/baselines/reference/typeOfThisInInstanceMember2.js
index b2b81ce3a2324..2b8867e7ec89a 100644
--- a/tests/baselines/reference/typeOfThisInInstanceMember2.js
+++ b/tests/baselines/reference/typeOfThisInInstanceMember2.js
@@ -56,7 +56,7 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
 var c;
 // all ok
 var r = c.x;
diff --git a/tests/baselines/reference/typeOfThisInMemberFunctions.js b/tests/baselines/reference/typeOfThisInMemberFunctions.js
index 3ac02393740e3..9ef1e3a4d7d39 100644
--- a/tests/baselines/reference/typeOfThisInMemberFunctions.js
+++ b/tests/baselines/reference/typeOfThisInMemberFunctions.js
@@ -42,7 +42,7 @@ var C = (function () {
         var r2 = this;
     };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
@@ -53,7 +53,7 @@ var D = (function () {
         var r2 = this;
     };
     return D;
-})();
+}());
 var E = (function () {
     function E() {
     }
@@ -64,4 +64,4 @@ var E = (function () {
         var r2 = this;
     };
     return E;
-})();
+}());
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers.js b/tests/baselines/reference/typeOfThisInStaticMembers.js
index 17754171ab350..039693224b768 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers.js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers.js
@@ -44,7 +44,7 @@ var C = (function () {
         return this;
     };
     return C;
-})();
+}());
 var t = C.bar();
 // all ok
 var r2 = t.foo + 1;
@@ -59,7 +59,7 @@ var C2 = (function () {
         return this;
     };
     return C2;
-})();
+}());
 var t2 = C2.bar();
 // all ok
 var r5 = t2.foo + 1;
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers2.js b/tests/baselines/reference/typeOfThisInStaticMembers2.js
index 9de5695640df5..b01770446beea 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers2.js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers2.js
@@ -13,10 +13,10 @@ var C = (function () {
     }
     C.foo = this; // error
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     C2.foo = this; // error
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/typeOfThisInStatics.js b/tests/baselines/reference/typeOfThisInStatics.js
index 5d59f6d7eb968..01519018ba251 100644
--- a/tests/baselines/reference/typeOfThisInStatics.js
+++ b/tests/baselines/reference/typeOfThisInStatics.js
@@ -26,4 +26,4 @@ var C = (function () {
         configurable: true
     });
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/typeParamExtendsOtherTypeParam.js b/tests/baselines/reference/typeParamExtendsOtherTypeParam.js
index 36a83bab712a6..70c6aa843708a 100644
--- a/tests/baselines/reference/typeParamExtendsOtherTypeParam.js
+++ b/tests/baselines/reference/typeParamExtendsOtherTypeParam.js
@@ -35,12 +35,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 // Below 2 should compile without error 
 var x;
 var y;
diff --git a/tests/baselines/reference/typeParameterAsBaseClass.js b/tests/baselines/reference/typeParameterAsBaseClass.js
index f17db28f657a2..a01b6a0cac2ac 100644
--- a/tests/baselines/reference/typeParameterAsBaseClass.js
+++ b/tests/baselines/reference/typeParameterAsBaseClass.js
@@ -14,9 +14,9 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(T);
+}(T));
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/typeParameterAsBaseType.js b/tests/baselines/reference/typeParameterAsBaseType.js
index de9a0ed2587cd..9c3a9bcfcd0c6 100644
--- a/tests/baselines/reference/typeParameterAsBaseType.js
+++ b/tests/baselines/reference/typeParameterAsBaseType.js
@@ -24,11 +24,11 @@ var C = (function (_super) {
         _super.apply(this, arguments);
     }
     return C;
-})(T);
+}(T));
 var C2 = (function (_super) {
     __extends(C2, _super);
     function C2() {
         _super.apply(this, arguments);
     }
     return C2;
-})(U);
+}(U));
diff --git a/tests/baselines/reference/typeParameterAsTypeArgument.js b/tests/baselines/reference/typeParameterAsTypeArgument.js
index cc9bd48585278..957177c273569 100644
--- a/tests/baselines/reference/typeParameterAsTypeArgument.js
+++ b/tests/baselines/reference/typeParameterAsTypeArgument.js
@@ -38,7 +38,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 //function foo<T, U extends T>(x: T, y: U) {
 //    foo<U, U>(y, y);
 //    return new C<U, T>();
diff --git a/tests/baselines/reference/typeParameterAssignability3.js b/tests/baselines/reference/typeParameterAssignability3.js
index b488bcb5ad201..f0391571e2bd4 100644
--- a/tests/baselines/reference/typeParameterAssignability3.js
+++ b/tests/baselines/reference/typeParameterAssignability3.js
@@ -31,7 +31,7 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 function foo(t, u) {
     var a;
     var b;
@@ -51,4 +51,4 @@ var C = (function () {
         };
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/typeParameterAssignmentCompat1.js b/tests/baselines/reference/typeParameterAssignmentCompat1.js
index 995213d0807e0..c7570a7d0657f 100644
--- a/tests/baselines/reference/typeParameterAssignmentCompat1.js
+++ b/tests/baselines/reference/typeParameterAssignmentCompat1.js
@@ -36,4 +36,4 @@ var C = (function () {
         return x;
     };
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js b/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js
index a14e010515bcc..bf7106c6e3710 100644
--- a/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js
+++ b/tests/baselines/reference/typeParameterDirectlyConstrainedToItself.js
@@ -24,12 +24,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 function f() { }
 function f2() { }
 var a;
diff --git a/tests/baselines/reference/typeParameterExtendingUnion1.js b/tests/baselines/reference/typeParameterExtendingUnion1.js
index 3027f119fb9df..75614f46d2194 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion1.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion1.js
@@ -23,21 +23,21 @@ var Animal = (function () {
     }
     Animal.prototype.run = function () { };
     return Animal;
-})();
+}());
 var Cat = (function (_super) {
     __extends(Cat, _super);
     function Cat() {
         _super.apply(this, arguments);
     }
     return Cat;
-})(Animal);
+}(Animal));
 var Dog = (function (_super) {
     __extends(Dog, _super);
     function Dog() {
         _super.apply(this, arguments);
     }
     return Dog;
-})(Animal);
+}(Animal));
 function run(a) {
     a.run();
 }
diff --git a/tests/baselines/reference/typeParameterExtendingUnion2.js b/tests/baselines/reference/typeParameterExtendingUnion2.js
index 55f6d3e07e220..b32c43bc5ec5a 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion2.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion2.js
@@ -23,21 +23,21 @@ var Animal = (function () {
     }
     Animal.prototype.run = function () { };
     return Animal;
-})();
+}());
 var Cat = (function (_super) {
     __extends(Cat, _super);
     function Cat() {
         _super.apply(this, arguments);
     }
     return Cat;
-})(Animal);
+}(Animal));
 var Dog = (function (_super) {
     __extends(Dog, _super);
     function Dog() {
         _super.apply(this, arguments);
     }
     return Dog;
-})(Animal);
+}(Animal));
 function run(a) {
     a.run();
 }
diff --git a/tests/baselines/reference/typeParameterInConstraint1.js b/tests/baselines/reference/typeParameterInConstraint1.js
index 1cce707112d04..d49a72f871a11 100644
--- a/tests/baselines/reference/typeParameterInConstraint1.js
+++ b/tests/baselines/reference/typeParameterInConstraint1.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js b/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js
index 3cdb735adfbbf..25f410c3a7bb4 100644
--- a/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js
+++ b/tests/baselines/reference/typeParameterIndirectlyConstrainedToItself.js
@@ -23,12 +23,12 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 function f() { }
 function f2() { }
 var a;
@@ -38,4 +38,4 @@ var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
diff --git a/tests/baselines/reference/typeParameterListWithTrailingComma1.js b/tests/baselines/reference/typeParameterListWithTrailingComma1.js
index 3891310fcb45b..b0121fde8fec5 100644
--- a/tests/baselines/reference/typeParameterListWithTrailingComma1.js
+++ b/tests/baselines/reference/typeParameterListWithTrailingComma1.js
@@ -7,4 +7,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/typeParameterUsedAsConstraint.js b/tests/baselines/reference/typeParameterUsedAsConstraint.js
index b1c55343aa0bd..627eb6cc64ed8 100644
--- a/tests/baselines/reference/typeParameterUsedAsConstraint.js
+++ b/tests/baselines/reference/typeParameterUsedAsConstraint.js
@@ -40,32 +40,32 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var C4 = (function () {
     function C4() {
     }
     return C4;
-})();
+}());
 var C5 = (function () {
     function C5() {
     }
     return C5;
-})();
+}());
 var C6 = (function () {
     function C6() {
     }
     return C6;
-})();
+}());
 function f() { }
 function f2() { }
 function f3() { }
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.js b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.js
index 56132d49acc20..d78cf2aa3665c 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.js
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.js
@@ -64,7 +64,7 @@ var C = (function () {
         return x;
     };
     return C;
-})();
+}());
 function foo(x, y) {
     function bar() {
         function baz(a, b) {
diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.js b/tests/baselines/reference/typeParameterWithInvalidConstraintType.js
index 4985519911a76..a40056f6a5963 100644
--- a/tests/baselines/reference/typeParameterWithInvalidConstraintType.js
+++ b/tests/baselines/reference/typeParameterWithInvalidConstraintType.js
@@ -23,4 +23,4 @@ var A = (function () {
         var d = x();
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/typeParametersAndParametersInComputedNames.js b/tests/baselines/reference/typeParametersAndParametersInComputedNames.js
index 1cb53663fbde2..7f2c04c2ec34b 100644
--- a/tests/baselines/reference/typeParametersAndParametersInComputedNames.js
+++ b/tests/baselines/reference/typeParametersAndParametersInComputedNames.js
@@ -18,4 +18,4 @@ var A = (function () {
     A.prototype[foo(a)] = function (a) {
     };
     return A;
-})();
+}());
diff --git a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js
index c6c624f7e2b34..699f3f2f26e5c 100644
--- a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js
+++ b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.js
@@ -92,7 +92,7 @@ var C = (function () {
     C.prototype.foo3 = function (x) { };
     C.prototype.foo4 = function (x) { };
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
@@ -100,4 +100,4 @@ var C2 = (function () {
     C2.prototype.foo2 = function (a, x) { };
     C2.prototype.foo3 = function (x) { };
     return C2;
-})();
+}());
diff --git a/tests/baselines/reference/typeParametersAvailableInNestedScope.js b/tests/baselines/reference/typeParametersAvailableInNestedScope.js
index 7262a867df7ea..d1b50029d23c2 100644
--- a/tests/baselines/reference/typeParametersAvailableInNestedScope.js
+++ b/tests/baselines/reference/typeParametersAvailableInNestedScope.js
@@ -37,7 +37,7 @@ var C = (function () {
         return temp(null);
     };
     return C;
-})();
+}());
 var c = new C();
 c.data = c.x(null);
 c.data = c.foo();
diff --git a/tests/baselines/reference/typeParametersInStaticAccessors.js b/tests/baselines/reference/typeParametersInStaticAccessors.js
index c621de910bc35..d9b33399af1f9 100644
--- a/tests/baselines/reference/typeParametersInStaticAccessors.js
+++ b/tests/baselines/reference/typeParametersInStaticAccessors.js
@@ -19,4 +19,4 @@ var foo = (function () {
         configurable: true
     });
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/typeParametersInStaticMethods.js b/tests/baselines/reference/typeParametersInStaticMethods.js
index f0cb27846412c..be69c87e59950 100644
--- a/tests/baselines/reference/typeParametersInStaticMethods.js
+++ b/tests/baselines/reference/typeParametersInStaticMethods.js
@@ -11,4 +11,4 @@ var foo = (function () {
     foo.M = function (x) {
     };
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/typeParametersInStaticProperties.js b/tests/baselines/reference/typeParametersInStaticProperties.js
index 5f5b109f8eee9..071dbf28dcb17 100644
--- a/tests/baselines/reference/typeParametersInStaticProperties.js
+++ b/tests/baselines/reference/typeParametersInStaticProperties.js
@@ -8,4 +8,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/typeQueryOnClass.js b/tests/baselines/reference/typeQueryOnClass.js
index 1c8b2424a7ec8..85dff0de831e0 100644
--- a/tests/baselines/reference/typeQueryOnClass.js
+++ b/tests/baselines/reference/typeQueryOnClass.js
@@ -102,7 +102,7 @@ var C = (function () {
     C.sa = 1;
     C.sb = function () { return 1; };
     return C;
-})();
+}());
 var c;
 // BUG 820454
 var r1;
@@ -113,7 +113,7 @@ var D = (function () {
     }
     D.prototype.foo = function () { };
     return D;
-})();
+}());
 var d;
 var r3;
 var r4;
diff --git a/tests/baselines/reference/typeQueryWithReservedWords.js b/tests/baselines/reference/typeQueryWithReservedWords.js
index e6e7f86541bbe..7561eeddb7528 100644
--- a/tests/baselines/reference/typeQueryWithReservedWords.js
+++ b/tests/baselines/reference/typeQueryWithReservedWords.js
@@ -26,4 +26,4 @@ var Controller = (function () {
     Controller.prototype.var = function () {
     };
     return Controller;
-})();
+}());
diff --git a/tests/baselines/reference/typeRelationships.js b/tests/baselines/reference/typeRelationships.js
index 1e31009f9b7a2..6f8f1ccd4ccc9 100644
--- a/tests/baselines/reference/typeRelationships.js
+++ b/tests/baselines/reference/typeRelationships.js
@@ -68,7 +68,7 @@ var C = (function () {
         return b ? this.c : this.self; // Should be C
     };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -91,4 +91,4 @@ var D = (function (_super) {
         this.c = this.d;
     };
     return D;
-})(C);
+}(C));
diff --git a/tests/baselines/reference/typeResolution.js b/tests/baselines/reference/typeResolution.js
index ed5ae95f23cde..cc2bd589bb00e 100644
--- a/tests/baselines/reference/typeResolution.js
+++ b/tests/baselines/reference/typeResolution.js
@@ -147,7 +147,7 @@ define(["require", "exports"], function (require, exports) {
                         d2.XisIn1_1_1();
                     };
                     return ClassA;
-                })();
+                }());
                 SubSubModule1.ClassA = ClassA;
                 var ClassB = (function () {
                     function ClassB() {
@@ -180,7 +180,7 @@ define(["require", "exports"], function (require, exports) {
                         d2.XisIn1_1_1();
                     };
                     return ClassB;
-                })();
+                }());
                 SubSubModule1.ClassB = ClassB;
                 var NonExportedClassQ = (function () {
                     function NonExportedClassQ() {
@@ -197,7 +197,7 @@ define(["require", "exports"], function (require, exports) {
                         }
                     }
                     return NonExportedClassQ;
-                })();
+                }());
             })(SubSubModule1 = SubModule1.SubSubModule1 || (SubModule1.SubSubModule1 = {}));
             // Should have no effect on S1.SS1.ClassA above because it is not exported
             var ClassA = (function () {
@@ -215,7 +215,7 @@ define(["require", "exports"], function (require, exports) {
                     }
                 }
                 return ClassA;
-            })();
+            }());
         })(SubModule1 = TopLevelModule1.SubModule1 || (TopLevelModule1.SubModule1 = {}));
         var SubModule2;
         (function (SubModule2) {
@@ -227,21 +227,21 @@ define(["require", "exports"], function (require, exports) {
                     }
                     ClassA.prototype.AisIn1_2_2 = function () { };
                     return ClassA;
-                })();
+                }());
                 SubSubModule2.ClassA = ClassA;
                 var ClassB = (function () {
                     function ClassB() {
                     }
                     ClassB.prototype.BisIn1_2_2 = function () { };
                     return ClassB;
-                })();
+                }());
                 SubSubModule2.ClassB = ClassB;
                 var ClassC = (function () {
                     function ClassC() {
                     }
                     ClassC.prototype.CisIn1_2_2 = function () { };
                     return ClassC;
-                })();
+                }());
                 SubSubModule2.ClassC = ClassC;
             })(SubSubModule2 = SubModule2.SubSubModule2 || (SubModule2.SubSubModule2 = {}));
         })(SubModule2 = TopLevelModule1.SubModule2 || (TopLevelModule1.SubModule2 = {}));
@@ -250,14 +250,14 @@ define(["require", "exports"], function (require, exports) {
             }
             ClassA.prototype.AisIn1 = function () { };
             return ClassA;
-        })();
+        }());
         var NotExportedModule;
         (function (NotExportedModule) {
             var ClassA = (function () {
                 function ClassA() {
                 }
                 return ClassA;
-            })();
+            }());
             NotExportedModule.ClassA = ClassA;
         })(NotExportedModule || (NotExportedModule = {}));
     })(TopLevelModule1 = exports.TopLevelModule1 || (exports.TopLevelModule1 = {}));
@@ -270,7 +270,7 @@ define(["require", "exports"], function (require, exports) {
                 }
                 ClassA.prototype.AisIn2_3 = function () { };
                 return ClassA;
-            })();
+            }());
             SubModule3.ClassA = ClassA;
         })(SubModule3 = TopLevelModule2.SubModule3 || (TopLevelModule2.SubModule3 = {}));
     })(TopLevelModule2 || (TopLevelModule2 = {}));
diff --git a/tests/baselines/reference/typeResolution.sourcemap.txt b/tests/baselines/reference/typeResolution.sourcemap.txt
index 69023ac95063a..2c109916e6c7e 100644
--- a/tests/baselines/reference/typeResolution.sourcemap.txt
+++ b/tests/baselines/reference/typeResolution.sourcemap.txt
@@ -774,7 +774,7 @@ sourceFile:typeResolution.ts
 1->Emitted(36, 21) Source(23, 13) + SourceIndex(0)
 2 >Emitted(36, 34) Source(23, 14) + SourceIndex(0)
 ---
->>>                })();
+>>>                }());
 1 >^^^^^^^^^^^^^^^^
 2 >                ^
 3 >                 
@@ -1328,7 +1328,7 @@ sourceFile:typeResolution.ts
 1->Emitted(69, 21) Source(46, 13) + SourceIndex(0)
 2 >Emitted(69, 34) Source(46, 14) + SourceIndex(0)
 ---
->>>                })();
+>>>                }());
 1 >^^^^^^^^^^^^^^^^
 2 >                ^
 3 >                 
@@ -1605,7 +1605,7 @@ sourceFile:typeResolution.ts
 1->Emitted(86, 21) Source(58, 13) + SourceIndex(0)
 2 >Emitted(86, 45) Source(58, 14) + SourceIndex(0)
 ---
->>>                })();
+>>>                }());
 1 >^^^^^^^^^^^^^^^^
 2 >                ^
 3 >                 
@@ -1930,7 +1930,7 @@ sourceFile:typeResolution.ts
 1->Emitted(104, 17) Source(73, 9) + SourceIndex(0)
 2 >Emitted(104, 30) Source(73, 10) + SourceIndex(0)
 ---
->>>            })();
+>>>            }());
 1 >^^^^^^^^^^^^
 2 >            ^
 3 >             
@@ -2200,7 +2200,7 @@ sourceFile:typeResolution.ts
 1 >Emitted(116, 21) Source(79, 59) + SourceIndex(0)
 2 >Emitted(116, 34) Source(79, 60) + SourceIndex(0)
 ---
->>>                })();
+>>>                }());
 1 >^^^^^^^^^^^^^^^^
 2 >                ^
 3 >                 
@@ -2276,7 +2276,7 @@ sourceFile:typeResolution.ts
 1 >Emitted(123, 21) Source(80, 59) + SourceIndex(0)
 2 >Emitted(123, 34) Source(80, 60) + SourceIndex(0)
 ---
->>>                })();
+>>>                }());
 1 >^^^^^^^^^^^^^^^^
 2 >                ^
 3 >                 
@@ -2352,7 +2352,7 @@ sourceFile:typeResolution.ts
 1 >Emitted(130, 21) Source(81, 59) + SourceIndex(0)
 2 >Emitted(130, 34) Source(81, 60) + SourceIndex(0)
 ---
->>>                })();
+>>>                }());
 1 >^^^^^^^^^^^^^^^^
 2 >                ^
 3 >                 
@@ -2515,7 +2515,7 @@ sourceFile:typeResolution.ts
 1 >Emitted(139, 13) Source(91, 5) + SourceIndex(0)
 2 >Emitted(139, 26) Source(91, 6) + SourceIndex(0)
 ---
->>>        })();
+>>>        }());
 1 >^^^^^^^^
 2 >        ^
 3 >         
@@ -2603,7 +2603,7 @@ sourceFile:typeResolution.ts
 1->Emitted(146, 17) Source(98, 31) + SourceIndex(0)
 2 >Emitted(146, 30) Source(98, 32) + SourceIndex(0)
 ---
->>>            })();
+>>>            }());
 1 >^^^^^^^^^^^^
 2 >            ^
 3 >             
@@ -2917,7 +2917,7 @@ sourceFile:typeResolution.ts
 1 >Emitted(159, 17) Source(106, 9) + SourceIndex(0)
 2 >Emitted(159, 30) Source(106, 10) + SourceIndex(0)
 ---
->>>            })();
+>>>            }());
 1 >^^^^^^^^^^^^
 2 >            ^
 3 >             
diff --git a/tests/baselines/reference/typeValueConflict1.js b/tests/baselines/reference/typeValueConflict1.js
index 0a6e92d0d626a..eaca97d31dde0 100644
--- a/tests/baselines/reference/typeValueConflict1.js
+++ b/tests/baselines/reference/typeValueConflict1.js
@@ -23,7 +23,7 @@ var M1;
         function A() {
         }
         return A;
-    })();
+    }());
     M1.A = A;
 })(M1 || (M1 = {}));
 var M2;
@@ -36,5 +36,5 @@ var M2;
             _super.apply(this, arguments);
         }
         return B;
-    })(M1.A);
+    }(M1.A));
 })(M2 || (M2 = {}));
diff --git a/tests/baselines/reference/typeValueConflict2.js b/tests/baselines/reference/typeValueConflict2.js
index 6e925b535a385..d89ab0fd357ca 100644
--- a/tests/baselines/reference/typeValueConflict2.js
+++ b/tests/baselines/reference/typeValueConflict2.js
@@ -30,7 +30,7 @@ var M1;
         function A(a) {
         }
         return A;
-    })();
+    }());
     M1.A = A;
 })(M1 || (M1 = {}));
 var M2;
@@ -43,7 +43,7 @@ var M2;
             _super.apply(this, arguments);
         }
         return B;
-    })(M1.A);
+    }(M1.A));
 })(M2 || (M2 = {}));
 var M3;
 (function (M3) {
@@ -54,5 +54,5 @@ var M3;
             _super.apply(this, arguments);
         }
         return B;
-    })(M1.A);
+    }(M1.A));
 })(M3 || (M3 = {}));
diff --git a/tests/baselines/reference/typedGenericPrototypeMember.js b/tests/baselines/reference/typedGenericPrototypeMember.js
index e5ba2e0e75f7a..16b4d93315fb2 100644
--- a/tests/baselines/reference/typedGenericPrototypeMember.js
+++ b/tests/baselines/reference/typedGenericPrototypeMember.js
@@ -12,5 +12,5 @@ var List = (function () {
     }
     List.prototype.add = function (item) { };
     return List;
-})();
+}());
 List.prototype.add("abc"); // Valid because T is instantiated to any
diff --git a/tests/baselines/reference/typeofANonExportedType.js b/tests/baselines/reference/typeofANonExportedType.js
index b575d4f8d4bcb..76e908e622d09 100644
--- a/tests/baselines/reference/typeofANonExportedType.js
+++ b/tests/baselines/reference/typeofANonExportedType.js
@@ -59,7 +59,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c2;
 var i2;
 var M;
@@ -69,7 +69,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
 var E;
@@ -84,6 +84,6 @@ var foo;
         function C() {
         }
         return C;
-    })();
+    }());
     foo.C = C;
 })(foo || (foo = {}));
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.js b/tests/baselines/reference/typeofAmbientExternalModules.js
index 258ca3fdc2ee6..9bcc5a2fa1536 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.js
+++ b/tests/baselines/reference/typeofAmbientExternalModules.js
@@ -24,7 +24,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 exports.C = C;
 //// [typeofAmbientExternalModules_1.js]
 "use strict";
@@ -32,7 +32,7 @@ var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 module.exports = D;
 //// [typeofAmbientExternalModules_2.js]
 "use strict";
diff --git a/tests/baselines/reference/typeofAnExportedType.js b/tests/baselines/reference/typeofAnExportedType.js
index 83c928fd40a14..0930039d25398 100644
--- a/tests/baselines/reference/typeofAnExportedType.js
+++ b/tests/baselines/reference/typeofAnExportedType.js
@@ -59,7 +59,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 exports.C = C;
 var c2;
 var i2;
@@ -70,7 +70,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
 })(M = exports.M || (exports.M = {}));
 exports.Z = M;
@@ -87,6 +87,6 @@ var foo;
         function C() {
         }
         return C;
-    })();
+    }());
     foo.C = C;
 })(foo = exports.foo || (exports.foo = {}));
diff --git a/tests/baselines/reference/typeofClass.js b/tests/baselines/reference/typeofClass.js
index 13487fe9c30be..8b257583d7b92 100644
--- a/tests/baselines/reference/typeofClass.js
+++ b/tests/baselines/reference/typeofClass.js
@@ -16,7 +16,7 @@ var K = (function () {
     function K() {
     }
     return K;
-})();
+}());
 var k1;
 k1.foo;
 k1.bar;
diff --git a/tests/baselines/reference/typeofClass2.js b/tests/baselines/reference/typeofClass2.js
index d16abbda6e523..a0c30c1b1665f 100644
--- a/tests/baselines/reference/typeofClass2.js
+++ b/tests/baselines/reference/typeofClass2.js
@@ -33,7 +33,7 @@ var C = (function () {
     C.foo = function (x) { };
     C.bar = function (x) { };
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -42,7 +42,7 @@ var D = (function (_super) {
     D.baz = function (x) { };
     D.prototype.foo = function () { };
     return D;
-})(C);
+}(C));
 var d;
 var r1;
 var r2;
diff --git a/tests/baselines/reference/typeofClassWithPrivates.js b/tests/baselines/reference/typeofClassWithPrivates.js
index 53b46c43bbbac..e517f6e471258 100644
--- a/tests/baselines/reference/typeofClassWithPrivates.js
+++ b/tests/baselines/reference/typeofClassWithPrivates.js
@@ -15,7 +15,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c;
 var r;
 var r2;
diff --git a/tests/baselines/reference/typeofExternalModules.js b/tests/baselines/reference/typeofExternalModules.js
index 95c3202ed36c5..0bb9f6820f6b5 100644
--- a/tests/baselines/reference/typeofExternalModules.js
+++ b/tests/baselines/reference/typeofExternalModules.js
@@ -22,7 +22,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 exports.C = C;
 //// [typeofExternalModules_exportAssign.js]
 "use strict";
@@ -30,7 +30,7 @@ var D = (function () {
     function D() {
     }
     return D;
-})();
+}());
 module.exports = D;
 //// [typeofExternalModules_core.js]
 "use strict";
diff --git a/tests/baselines/reference/typeofInternalModules.js b/tests/baselines/reference/typeofInternalModules.js
index b885d8c9dce40..7f15dc87a4670 100644
--- a/tests/baselines/reference/typeofInternalModules.js
+++ b/tests/baselines/reference/typeofInternalModules.js
@@ -33,7 +33,7 @@ var Outer;
             function C() {
             }
             return C;
-        })();
+        }());
         instantiated.C = C;
     })(instantiated = Outer.instantiated || (Outer.instantiated = {}));
 })(Outer || (Outer = {}));
diff --git a/tests/baselines/reference/typeofModuleWithoutExports.js b/tests/baselines/reference/typeofModuleWithoutExports.js
index 96034be3c1b42..a29bd9b6a376b 100644
--- a/tests/baselines/reference/typeofModuleWithoutExports.js
+++ b/tests/baselines/reference/typeofModuleWithoutExports.js
@@ -16,6 +16,6 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
 })(M || (M = {}));
 var r;
diff --git a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js
index 1c66c5f4d1ecb..a868aad18155e 100644
--- a/tests/baselines/reference/typeofOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/typeofOperatorWithAnyOtherType.js
@@ -93,7 +93,7 @@ var A = (function () {
         return a;
     };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.js b/tests/baselines/reference/typeofOperatorWithBooleanType.js
index b9db33b11a4bb..cf7bbcd5f73e0 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.js
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.js
@@ -60,7 +60,7 @@ var A = (function () {
     }
     A.foo = function () { return false; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.js b/tests/baselines/reference/typeofOperatorWithNumberType.js
index b980b820ce18e..ecf3eebe5b6f8 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.js
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.js
@@ -67,7 +67,7 @@ var A = (function () {
     }
     A.foo = function () { return 1; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.js b/tests/baselines/reference/typeofOperatorWithStringType.js
index 9b5cbb20b36f8..14b712397dfe6 100644
--- a/tests/baselines/reference/typeofOperatorWithStringType.js
+++ b/tests/baselines/reference/typeofOperatorWithStringType.js
@@ -67,7 +67,7 @@ var A = (function () {
     }
     A.foo = function () { return ""; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/typeofProperty.js b/tests/baselines/reference/typeofProperty.js
index 6735883bc8f7d..b7f1ea68cc491 100644
--- a/tests/baselines/reference/typeofProperty.js
+++ b/tests/baselines/reference/typeofProperty.js
@@ -53,22 +53,22 @@ var C1 = (function () {
     function C1() {
     }
     return C1;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3() {
     }
     return C3;
-})();
+}());
 var ValidClass = (function () {
     function ValidClass() {
     }
     return ValidClass;
-})();
+}());
 var vcInstance = new ValidClass();
 var viInstance = vcInstance;
 var x1; // x1: string
diff --git a/tests/baselines/reference/typesWithDuplicateTypeParameters.js b/tests/baselines/reference/typesWithDuplicateTypeParameters.js
index cc80d4d57b4d7..d0c6c450e4b52 100644
--- a/tests/baselines/reference/typesWithDuplicateTypeParameters.js
+++ b/tests/baselines/reference/typesWithDuplicateTypeParameters.js
@@ -13,11 +13,11 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 function f() { }
 function f2() { }
diff --git a/tests/baselines/reference/typesWithPrivateConstructor.js b/tests/baselines/reference/typesWithPrivateConstructor.js
index 0faaa4428b5ed..d894eeda49a07 100644
--- a/tests/baselines/reference/typesWithPrivateConstructor.js
+++ b/tests/baselines/reference/typesWithPrivateConstructor.js
@@ -22,13 +22,13 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = new C();
 var r = c.constructor;
 var C2 = (function () {
     function C2(x) {
     }
     return C2;
-})();
+}());
 var c2 = new C2();
 var r2 = c2.constructor;
diff --git a/tests/baselines/reference/typesWithPublicConstructor.js b/tests/baselines/reference/typesWithPublicConstructor.js
index 3a037ec0253b1..1078c95467ca8 100644
--- a/tests/baselines/reference/typesWithPublicConstructor.js
+++ b/tests/baselines/reference/typesWithPublicConstructor.js
@@ -22,13 +22,13 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var c = new C();
 var r = c.constructor;
 var C2 = (function () {
     function C2(x) {
     }
     return C2;
-})();
+}());
 var c2 = new C2();
 var r2 = c2.constructor;
diff --git a/tests/baselines/reference/typesWithSpecializedCallSignatures.js b/tests/baselines/reference/typesWithSpecializedCallSignatures.js
index 3de4134789ea9..e83fd36ae625d 100644
--- a/tests/baselines/reference/typesWithSpecializedCallSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.js
@@ -52,21 +52,21 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
         _super.apply(this, arguments);
     }
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 var C = (function () {
     function C() {
     }
@@ -74,7 +74,7 @@ var C = (function () {
         return x;
     };
     return C;
-})();
+}());
 var c = new C();
 var i;
 var a;
diff --git a/tests/baselines/reference/typesWithSpecializedConstructSignatures.js b/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
index c66c471b3a102..63d5e9bb5b2c9 100644
--- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
@@ -50,27 +50,27 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var Derived1 = (function (_super) {
     __extends(Derived1, _super);
     function Derived1() {
         _super.apply(this, arguments);
     }
     return Derived1;
-})(Base);
+}(Base));
 var Derived2 = (function (_super) {
     __extends(Derived2, _super);
     function Derived2() {
         _super.apply(this, arguments);
     }
     return Derived2;
-})(Base);
+}(Base));
 var C = (function () {
     function C(x) {
         return x;
     }
     return C;
-})();
+}());
 var c = new C('a');
 var i;
 var a;
diff --git a/tests/baselines/reference/undeclaredBase.js b/tests/baselines/reference/undeclaredBase.js
index b1efffc0e2444..3dd27a3dbfbdb 100644
--- a/tests/baselines/reference/undeclaredBase.js
+++ b/tests/baselines/reference/undeclaredBase.js
@@ -17,6 +17,6 @@ var M;
             _super.apply(this, arguments);
         }
         return C;
-    })(M.I);
+    }(M.I));
     M.C = C;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/undeclaredMethod.js b/tests/baselines/reference/undeclaredMethod.js
index 2cef06cc59356..f80d9552724e7 100644
--- a/tests/baselines/reference/undeclaredMethod.js
+++ b/tests/baselines/reference/undeclaredMethod.js
@@ -21,7 +21,7 @@ var M;
         }
         C.prototype.salt = function () { };
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
 var c = new M.C();
diff --git a/tests/baselines/reference/undefinedAssignableToEveryType.js b/tests/baselines/reference/undefinedAssignableToEveryType.js
index 08e1c4f10703a..9646e7f4e87d5 100644
--- a/tests/baselines/reference/undefinedAssignableToEveryType.js
+++ b/tests/baselines/reference/undefinedAssignableToEveryType.js
@@ -47,7 +47,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var ac;
 var ai;
 var E;
diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
index c89c3f6538122..513464daa85b1 100644
--- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
+++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
@@ -132,112 +132,112 @@ var Base = (function () {
     function Base() {
     }
     return Base;
-})();
+}());
 var D0 = (function (_super) {
     __extends(D0, _super);
     function D0() {
         _super.apply(this, arguments);
     }
     return D0;
-})(Base);
+}(Base));
 var DA = (function (_super) {
     __extends(DA, _super);
     function DA() {
         _super.apply(this, arguments);
     }
     return DA;
-})(Base);
+}(Base));
 var D1 = (function (_super) {
     __extends(D1, _super);
     function D1() {
         _super.apply(this, arguments);
     }
     return D1;
-})(Base);
+}(Base));
 var D1A = (function (_super) {
     __extends(D1A, _super);
     function D1A() {
         _super.apply(this, arguments);
     }
     return D1A;
-})(Base);
+}(Base));
 var D2 = (function (_super) {
     __extends(D2, _super);
     function D2() {
         _super.apply(this, arguments);
     }
     return D2;
-})(Base);
+}(Base));
 var D2A = (function (_super) {
     __extends(D2A, _super);
     function D2A() {
         _super.apply(this, arguments);
     }
     return D2A;
-})(Base);
+}(Base));
 var D3 = (function (_super) {
     __extends(D3, _super);
     function D3() {
         _super.apply(this, arguments);
     }
     return D3;
-})(Base);
+}(Base));
 var D3A = (function (_super) {
     __extends(D3A, _super);
     function D3A() {
         _super.apply(this, arguments);
     }
     return D3A;
-})(Base);
+}(Base));
 var D4 = (function (_super) {
     __extends(D4, _super);
     function D4() {
         _super.apply(this, arguments);
     }
     return D4;
-})(Base);
+}(Base));
 var D5 = (function (_super) {
     __extends(D5, _super);
     function D5() {
         _super.apply(this, arguments);
     }
     return D5;
-})(Base);
+}(Base));
 var D6 = (function (_super) {
     __extends(D6, _super);
     function D6() {
         _super.apply(this, arguments);
     }
     return D6;
-})(Base);
+}(Base));
 var D7 = (function (_super) {
     __extends(D7, _super);
     function D7() {
         _super.apply(this, arguments);
     }
     return D7;
-})(Base);
+}(Base));
 var D8 = (function (_super) {
     __extends(D8, _super);
     function D8() {
         _super.apply(this, arguments);
     }
     return D8;
-})(Base);
+}(Base));
 var D9 = (function (_super) {
     __extends(D9, _super);
     function D9() {
         _super.apply(this, arguments);
     }
     return D9;
-})(Base);
+}(Base));
 var D10 = (function (_super) {
     __extends(D10, _super);
     function D10() {
         _super.apply(this, arguments);
     }
     return D10;
-})(Base);
+}(Base));
 var E;
 (function (E) {
     E[E["A"] = 0] = "A";
@@ -248,7 +248,7 @@ var D11 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D11;
-})(Base);
+}(Base));
 function f() { }
 var f;
 (function (f) {
@@ -260,12 +260,12 @@ var D12 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D12;
-})(Base);
+}(Base));
 var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var c;
 (function (c) {
     c.bar = 1;
@@ -276,21 +276,21 @@ var D13 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D13;
-})(Base);
+}(Base));
 var D14 = (function (_super) {
     __extends(D14, _super);
     function D14() {
         _super.apply(this, arguments);
     }
     return D14;
-})(Base);
+}(Base));
 var D15 = (function (_super) {
     __extends(D15, _super);
     function D15() {
         _super.apply(this, arguments);
     }
     return D15;
-})(Base);
+}(Base));
 //class D15<T, U extends T> extends Base {
 //    foo: U;
 //}
@@ -300,11 +300,11 @@ var D16 = (function (_super) {
         _super.apply(this, arguments);
     }
     return D16;
-})(Base);
+}(Base));
 var D17 = (function (_super) {
     __extends(D17, _super);
     function D17() {
         _super.apply(this, arguments);
     }
     return D17;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/undefinedTypeAssignment4.js b/tests/baselines/reference/undefinedTypeAssignment4.js
index 186afd872c3e6..a5d7a117a9d7b 100644
--- a/tests/baselines/reference/undefinedTypeAssignment4.js
+++ b/tests/baselines/reference/undefinedTypeAssignment4.js
@@ -17,7 +17,7 @@ var undefined = (function () {
     function undefined() {
     }
     return undefined;
-})();
+}());
 var undefined;
 (function (undefined) {
     undefined.x = 42;
diff --git a/tests/baselines/reference/underscoreMapFirst.js b/tests/baselines/reference/underscoreMapFirst.js
index 4ee69572f1d0c..a615faea805e9 100644
--- a/tests/baselines/reference/underscoreMapFirst.js
+++ b/tests/baselines/reference/underscoreMapFirst.js
@@ -65,4 +65,4 @@ var MyView = (function (_super) {
         return _.map(allSeries, _.first);
     };
     return MyView;
-})(View);
+}(View));
diff --git a/tests/baselines/reference/unexpectedStatementBlockTerminator.js b/tests/baselines/reference/unexpectedStatementBlockTerminator.js
index 87b4652375aca..f06b75c1340e7 100644
--- a/tests/baselines/reference/unexpectedStatementBlockTerminator.js
+++ b/tests/baselines/reference/unexpectedStatementBlockTerminator.js
@@ -12,10 +12,10 @@ var Foo = (function () {
     function Foo() {
     }
     return Foo;
-})();
+}());
 var Bar = (function () {
     function Bar() {
     }
     return Bar;
-})();
+}());
 function Goo() { return { a: 1, b: 2 }; }
diff --git a/tests/baselines/reference/unexportedInstanceClassVariables.js b/tests/baselines/reference/unexportedInstanceClassVariables.js
index 95bdbc032b72f..7ac4f6d1b16f7 100644
--- a/tests/baselines/reference/unexportedInstanceClassVariables.js
+++ b/tests/baselines/reference/unexportedInstanceClassVariables.js
@@ -19,7 +19,7 @@ var M;
         function A(val) {
         }
         return A;
-    })();
+    }());
 })(M || (M = {}));
 var M;
 (function (M) {
@@ -27,6 +27,6 @@ var M;
         function A() {
         }
         return A;
-    })();
+    }());
     var a = new A();
 })(M || (M = {}));
diff --git a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js
index d30b78ca2c311..c1c6918c770b0 100644
--- a/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js
+++ b/tests/baselines/reference/unionSubtypeIfEveryConstituentTypeIsSubtype.js
@@ -153,12 +153,12 @@ var A = (function () {
     function A() {
     }
     return A;
-})();
+}());
 var A2 = (function () {
     function A2() {
     }
     return A2;
-})();
+}());
 var E2;
 (function (E2) {
     E2[E2["A"] = 0] = "A";
@@ -172,7 +172,7 @@ var c = (function () {
     function c() {
     }
     return c;
-})();
+}());
 var c;
 (function (c) {
     c.bar = 1;
diff --git a/tests/baselines/reference/unionTypeEquivalence.js b/tests/baselines/reference/unionTypeEquivalence.js
index 3f4ad647dd5e6..1ff47f68e5f1b 100644
--- a/tests/baselines/reference/unionTypeEquivalence.js
+++ b/tests/baselines/reference/unionTypeEquivalence.js
@@ -30,7 +30,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -38,7 +38,7 @@ var D = (function (_super) {
     }
     D.prototype.foo = function () { };
     return D;
-})(C);
+}(C));
 var x;
 var x;
 // A | B is equivalent to B | A.
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.js b/tests/baselines/reference/unionTypeFromArrayLiteral.js
index 1bfadd68ca650..95dd9d398536b 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.js
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.js
@@ -44,13 +44,13 @@ var C = (function () {
     }
     C.prototype.foo = function () { };
     return C;
-})();
+}());
 var D = (function () {
     function D() {
     }
     D.prototype.foo2 = function () { };
     return D;
-})();
+}());
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -58,7 +58,7 @@ var E = (function (_super) {
     }
     E.prototype.foo3 = function () { };
     return E;
-})(C);
+}(C));
 var F = (function (_super) {
     __extends(F, _super);
     function F() {
@@ -66,7 +66,7 @@ var F = (function (_super) {
     }
     F.prototype.foo4 = function () { };
     return F;
-})(C);
+}(C));
 var c, d, e, f;
 var arr6 = [c, d]; // (C | D)[]
 var arr7 = [c, d, e]; // (C | D)[]
diff --git a/tests/baselines/reference/unionTypePropertyAccessibility.js b/tests/baselines/reference/unionTypePropertyAccessibility.js
index 3c5c4b42fee8f..afa8d07c242bc 100644
--- a/tests/baselines/reference/unionTypePropertyAccessibility.js
+++ b/tests/baselines/reference/unionTypePropertyAccessibility.js
@@ -53,22 +53,22 @@ var Default = (function () {
     function Default() {
     }
     return Default;
-})();
+}());
 var Public = (function () {
     function Public() {
     }
     return Public;
-})();
+}());
 var Protected = (function () {
     function Protected() {
     }
     return Protected;
-})();
+}());
 var Private = (function () {
     function Private() {
     }
     return Private;
-})();
+}());
 var v1;
 var v2;
 var v3;
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.js b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.js
index f8a5cd96b4858..46ca2a40e83dc 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.js
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction1.js
@@ -24,21 +24,21 @@ var Module = (function () {
     function Module() {
     }
     return Module;
-})();
+}());
 var Namespace = (function () {
     function Namespace() {
     }
     return Namespace;
-})();
+}());
 var Class = (function () {
     function Class() {
     }
     return Class;
-})();
+}());
 var Property = (function () {
     function Property() {
     }
     return Property;
-})();
+}());
 var t;
 t.parent;
diff --git a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js
index 69411b1ffcb21..b3eeb8ea2442a 100644
--- a/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js
+++ b/tests/baselines/reference/unionTypeWithRecursiveSubtypeReduction2.js
@@ -26,22 +26,22 @@ var Module = (function () {
     function Module() {
     }
     return Module;
-})();
+}());
 var Namespace = (function () {
     function Namespace() {
     }
     return Namespace;
-})();
+}());
 var Class = (function () {
     function Class() {
     }
     return Class;
-})();
+}());
 var Property = (function () {
     function Property() {
     }
     return Property;
-})();
+}());
 var c;
 var p;
 c = p;
diff --git a/tests/baselines/reference/unionTypesAssignability.js b/tests/baselines/reference/unionTypesAssignability.js
index 80eafb4f50680..e07901347a58e 100644
--- a/tests/baselines/reference/unionTypesAssignability.js
+++ b/tests/baselines/reference/unionTypesAssignability.js
@@ -83,7 +83,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var D = (function (_super) {
     __extends(D, _super);
     function D() {
@@ -91,7 +91,7 @@ var D = (function (_super) {
     }
     D.prototype.foo1 = function () { };
     return D;
-})(C);
+}(C));
 var E = (function (_super) {
     __extends(E, _super);
     function E() {
@@ -99,7 +99,7 @@ var E = (function (_super) {
     }
     E.prototype.foo2 = function () { };
     return E;
-})(C);
+}(C));
 var unionDE;
 var num;
 var str;
diff --git a/tests/baselines/reference/unknownSymbolInGenericReturnType.js b/tests/baselines/reference/unknownSymbolInGenericReturnType.js
index b3ca034f20db1..27788285b2403 100644
--- a/tests/baselines/reference/unknownSymbolInGenericReturnType.js
+++ b/tests/baselines/reference/unknownSymbolInGenericReturnType.js
@@ -24,4 +24,4 @@ var Linq = (function () {
         return result;
     };
     return Linq;
-})();
+}());
diff --git a/tests/baselines/reference/unknownSymbols1.js b/tests/baselines/reference/unknownSymbols1.js
index cab42726c737c..03ed4990c29ed 100644
--- a/tests/baselines/reference/unknownSymbols1.js
+++ b/tests/baselines/reference/unknownSymbols1.js
@@ -49,28 +49,28 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var C2 = (function () {
     function C2() {
     }
     return C2;
-})();
+}());
 var C3 = (function () {
     function C3(x) {
     }
     return C3;
-})();
+}());
 var C4 = (function (_super) {
     __extends(C4, _super);
     function C4() {
         _super.call(this, asdf);
     }
     return C4;
-})(C3);
+}(C3));
 var x2 = this.asdf; // no error, this is any
 var C5 = (function () {
     function C5() {
         this.asdf = asdf;
     }
     return C5;
-})();
+}());
diff --git a/tests/baselines/reference/unknownTypeArgOnCall.js b/tests/baselines/reference/unknownTypeArgOnCall.js
index 6e1da3b5257be..129e2e351f15a 100644
--- a/tests/baselines/reference/unknownTypeArgOnCall.js
+++ b/tests/baselines/reference/unknownTypeArgOnCall.js
@@ -16,6 +16,6 @@ var Foo = (function () {
         return null;
     };
     return Foo;
-})();
+}());
 var f = new Foo();
 var r = f.clone();
diff --git a/tests/baselines/reference/unqualifiedCallToClassStatic1.js b/tests/baselines/reference/unqualifiedCallToClassStatic1.js
index 6de5634af9cab..6c78a737fe862 100644
--- a/tests/baselines/reference/unqualifiedCallToClassStatic1.js
+++ b/tests/baselines/reference/unqualifiedCallToClassStatic1.js
@@ -15,4 +15,4 @@ var Vector = (function () {
         foo();
     };
     return Vector;
-})();
+}());
diff --git a/tests/baselines/reference/unspecializedConstraints.js b/tests/baselines/reference/unspecializedConstraints.js
index ed844f740ba7d..7b3938c7099d1 100644
--- a/tests/baselines/reference/unspecializedConstraints.js
+++ b/tests/baselines/reference/unspecializedConstraints.js
@@ -165,7 +165,7 @@ var ts;
         function Symbol() {
         }
         return Symbol;
-    })();
+    }());
     var Type = (function (_super) {
         __extends(Type, _super);
         function Type() {
@@ -229,7 +229,7 @@ var ts;
         Type.prototype.isSubTypeOf = function (type) {
         };
         return Type;
-    })(Symbol);
+    }(Symbol));
     var Property = (function (_super) {
         __extends(Property, _super);
         function Property(name, type, flags) {
@@ -244,7 +244,7 @@ var ts;
                 this.type.equals(other.type);
         };
         return Property;
-    })(Symbol);
+    }(Symbol));
     var PropertyFlags;
     (function (PropertyFlags) {
         PropertyFlags[PropertyFlags["Optional"] = 1] = "Optional";
@@ -269,7 +269,7 @@ var ts;
                 this.returnType.equals(other.returnType);
         };
         return Signature;
-    })(Symbol);
+    }(Symbol));
     var Parameter = (function (_super) {
         __extends(Parameter, _super);
         function Parameter(name, type, flags) {
@@ -284,7 +284,7 @@ var ts;
                 this.type.equals(other.type);
         };
         return Parameter;
-    })(Symbol);
+    }(Symbol));
     var ParameterFlags;
     (function (ParameterFlags) {
         ParameterFlags[ParameterFlags["Optional"] = 1] = "Optional";
diff --git a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
index 2f2d4e87c46c3..e991db69367f3 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
@@ -64,7 +64,7 @@ var C = (function () {
         this.caller = function () { };
     }
     return C;
-})();
+}());
 var c2;
 var r4 = c2(); // should be an error
 var C2 = (function (_super) {
@@ -73,7 +73,7 @@ var C2 = (function (_super) {
         _super.apply(this, arguments);
     }
     return C2;
-})(Function); // error
+}(Function)); // error
 var c3;
 var r5 = c3(); // error
 var z;
diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js
index 7ed19f775f677..ef1d501889268 100644
--- a/tests/baselines/reference/unusedImportDeclaration.js
+++ b/tests/baselines/reference/unusedImportDeclaration.js
@@ -21,7 +21,7 @@ var TesterB = (function () {
     function TesterB() {
     }
     return TesterB;
-})();
+}());
 module.exports = TesterB;
 //// [unusedImportDeclaration_testerA.js]
 "use strict";
diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js
index 4c5009eca962a..a57e18fec7228 100644
--- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js
+++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.js
@@ -29,7 +29,7 @@ var A;
             this.y = y;
         }
         return Point;
-    })();
+    }());
     A.Point = Point;
 })(A || (A = {}));
 var C;
diff --git a/tests/baselines/reference/validNullAssignments.js b/tests/baselines/reference/validNullAssignments.js
index 46ef380746499..8509a46cc975e 100644
--- a/tests/baselines/reference/validNullAssignments.js
+++ b/tests/baselines/reference/validNullAssignments.js
@@ -46,7 +46,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var f;
 f = null; // ok
 C = null; // error
diff --git a/tests/baselines/reference/validUndefinedAssignments.js b/tests/baselines/reference/validUndefinedAssignments.js
index d91875da8a5a3..792b277ae172a 100644
--- a/tests/baselines/reference/validUndefinedAssignments.js
+++ b/tests/baselines/reference/validUndefinedAssignments.js
@@ -35,7 +35,7 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 var f;
 f = x;
 var g;
diff --git a/tests/baselines/reference/validUseOfThisInSuper.js b/tests/baselines/reference/validUseOfThisInSuper.js
index 4378d89ad4b63..027ba254ae019 100644
--- a/tests/baselines/reference/validUseOfThisInSuper.js
+++ b/tests/baselines/reference/validUseOfThisInSuper.js
@@ -20,7 +20,7 @@ var Base = (function () {
         this.b = b;
     }
     return Base;
-})();
+}());
 var Super = (function (_super) {
     __extends(Super, _super);
     function Super() {
@@ -28,4 +28,4 @@ var Super = (function (_super) {
         _super.call(this, (function () { return _this; })()); // ok since this is not the case: The constructor declares parameter properties or the containing class declares instance member variables with initializers.
     }
     return Super;
-})(Base);
+}(Base));
diff --git a/tests/baselines/reference/varArgConstructorMemberParameter.js b/tests/baselines/reference/varArgConstructorMemberParameter.js
index 7f1ef8d5b3a5e..620642a751403 100644
--- a/tests/baselines/reference/varArgConstructorMemberParameter.js
+++ b/tests/baselines/reference/varArgConstructorMemberParameter.js
@@ -21,13 +21,13 @@ var Foo1 = (function () {
         }
     }
     return Foo1;
-})();
+}());
 var Foo2 = (function () {
     function Foo2(args) {
         this.args = args;
     }
     return Foo2;
-})();
+}());
 var Foo3 = (function () {
     function Foo3(public) {
         var args = [];
@@ -36,4 +36,4 @@ var Foo3 = (function () {
         }
     }
     return Foo3;
-})();
+}());
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.js b/tests/baselines/reference/varArgsOnConstructorTypes.js
index eb9571c97f5ed..db8f566702aa3 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.js
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.js
@@ -36,7 +36,7 @@ define(["require", "exports"], function (require, exports) {
         function A(ctor) {
         }
         return A;
-    })();
+    }());
     exports.A = A;
     var B = (function (_super) {
         __extends(B, _super);
@@ -46,7 +46,7 @@ define(["require", "exports"], function (require, exports) {
             this.p2 = url;
         }
         return B;
-    })(A);
+    }(A));
     exports.B = B;
     var reg;
     reg.register(B);
diff --git a/tests/baselines/reference/varAsID.js b/tests/baselines/reference/varAsID.js
index d123d10c53107..5ce1d82d165fc 100644
--- a/tests/baselines/reference/varAsID.js
+++ b/tests/baselines/reference/varAsID.js
@@ -25,12 +25,12 @@ var Foo = (function () {
         this.x = 1;
     }
     return Foo;
-})();
+}());
 var f = new Foo();
 var Foo2 = (function () {
     function Foo2() {
         this.x = 1;
     }
     return Foo2;
-})();
+}());
 var f2 = new Foo2();
diff --git a/tests/baselines/reference/vararg.js b/tests/baselines/reference/vararg.js
index 038afb90cbc50..015c8c9957a7e 100644
--- a/tests/baselines/reference/vararg.js
+++ b/tests/baselines/reference/vararg.js
@@ -74,7 +74,7 @@ var M;
             return builder;
         };
         return C;
-    })();
+    }());
     M.C = C;
 })(M || (M = {}));
 var x = new M.C();
diff --git a/tests/baselines/reference/vardecl.js b/tests/baselines/reference/vardecl.js
index 9b19e1000a9e2..a7ebb811c505c 100644
--- a/tests/baselines/reference/vardecl.js
+++ b/tests/baselines/reference/vardecl.js
@@ -139,13 +139,13 @@ var m2;
             this.b = b;
         }
         return C;
-    })();
+    }());
     var C2 = (function () {
         function C2(b) {
             this.b = b;
         }
         return C2;
-    })();
+    }());
     m2.C2 = C2;
     var m;
     var b23;
diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js
index cddf9ebf25461..692c4e3aebe3c 100644
--- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js
+++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.js
@@ -135,7 +135,7 @@ var Errors;
         function ConnectionError /* extends Error */(request) {
         }
         return ConnectionError /* extends Error */;
-    })();
+    }());
     Errors.ConnectionError /* extends Error */ = ConnectionError /* extends Error */;
 })(Errors || (Errors = {}));
 var FileService = (function () {
@@ -160,4 +160,4 @@ var FileService = (function () {
         });
     };
     return FileService;
-})();
+}());
diff --git a/tests/baselines/reference/visSyntax.js b/tests/baselines/reference/visSyntax.js
index be62516fd07d5..8d7d5991503d5 100644
--- a/tests/baselines/reference/visSyntax.js
+++ b/tests/baselines/reference/visSyntax.js
@@ -18,7 +18,7 @@ var M;
         function C() {
         }
         return C;
-    })();
+    }());
     M.C = C;
     M.x = 10;
 })(M || (M = {}));
diff --git a/tests/baselines/reference/visibilityOfTypeParameters.js b/tests/baselines/reference/visibilityOfTypeParameters.js
index 170a8ef5d3778..e9cd9f4deda95 100644
--- a/tests/baselines/reference/visibilityOfTypeParameters.js
+++ b/tests/baselines/reference/visibilityOfTypeParameters.js
@@ -15,7 +15,7 @@ var MyClass = (function () {
         return val;
     };
     return MyClass;
-})();
+}());
 exports.MyClass = MyClass;
 
 
diff --git a/tests/baselines/reference/voidOperatorWithAnyOtherType.js b/tests/baselines/reference/voidOperatorWithAnyOtherType.js
index fbe85326d3ac9..cbae98f67fc60 100644
--- a/tests/baselines/reference/voidOperatorWithAnyOtherType.js
+++ b/tests/baselines/reference/voidOperatorWithAnyOtherType.js
@@ -79,7 +79,7 @@ var A = (function () {
         return a;
     };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.js b/tests/baselines/reference/voidOperatorWithBooleanType.js
index 25099108b9bd3..bd6faedcb2b5e 100644
--- a/tests/baselines/reference/voidOperatorWithBooleanType.js
+++ b/tests/baselines/reference/voidOperatorWithBooleanType.js
@@ -47,7 +47,7 @@ var A = (function () {
     }
     A.foo = function () { return false; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/voidOperatorWithNumberType.js b/tests/baselines/reference/voidOperatorWithNumberType.js
index 9a0a31d4fe5f6..ca17612c6cc56 100644
--- a/tests/baselines/reference/voidOperatorWithNumberType.js
+++ b/tests/baselines/reference/voidOperatorWithNumberType.js
@@ -55,7 +55,7 @@ var A = (function () {
     }
     A.foo = function () { return 1; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/voidOperatorWithStringType.js b/tests/baselines/reference/voidOperatorWithStringType.js
index 5949c93acd426..eaaa981528d00 100644
--- a/tests/baselines/reference/voidOperatorWithStringType.js
+++ b/tests/baselines/reference/voidOperatorWithStringType.js
@@ -54,7 +54,7 @@ var A = (function () {
     }
     A.foo = function () { return ""; };
     return A;
-})();
+}());
 var M;
 (function (M) {
 })(M || (M = {}));
diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js
index 275d5fcadcc21..92a90cb217762 100644
--- a/tests/baselines/reference/withImportDecl.js
+++ b/tests/baselines/reference/withImportDecl.js
@@ -50,7 +50,7 @@ define(["require", "exports"], function (require, exports) {
         function A() {
         }
         return A;
-    })();
+    }());
     exports.A = A;
 });
 //// [withImportDecl_1.js]
diff --git a/tests/baselines/reference/withStatementErrors.js b/tests/baselines/reference/withStatementErrors.js
index 7c496f014a713..de2fb40dac917 100644
--- a/tests/baselines/reference/withStatementErrors.js
+++ b/tests/baselines/reference/withStatementErrors.js
@@ -28,5 +28,5 @@ with (ooo.eee.oo.ah_ah.ting.tang.walla.walla) {
         function C() {
         }
         return C;
-    })(); // error   
+    }()); // error   
 }
diff --git a/tests/baselines/reference/witness.js b/tests/baselines/reference/witness.js
index 82a1298f1568c..e0a4c35687325 100644
--- a/tests/baselines/reference/witness.js
+++ b/tests/baselines/reference/witness.js
@@ -157,7 +157,7 @@ var InitClass = (function () {
         var y;
     };
     return InitClass;
-})();
+}());
 // Return type
 function fnReturn1() {
     return fnReturn1();
@@ -231,7 +231,7 @@ var C = (function () {
         return new a(this.fn3);
     };
     return C;
-})();
+}());
 function fn5() {
     var a;
     return new a(fn5);
@@ -255,7 +255,7 @@ var C2 = (function () {
         this.n = this.n; // n: any
     }
     return C2;
-})();
+}());
 var c2inst = new C2().n;
 var c2inst;
 // Constructor function property access
@@ -264,7 +264,7 @@ var C3 = (function () {
     }
     C3.q = C3.q;
     return C3;
-})();
+}());
 var qq = C3.q;
 var qq;
 // Parentheses - tested a bunch above
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints.js b/tests/baselines/reference/wrappedAndRecursiveConstraints.js
index 91227a032226d..06103235ecb97 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints.js
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints.js
@@ -26,7 +26,7 @@ var C = (function () {
         return x;
     };
     return C;
-})();
+}());
 var y = null;
 var c = new C(y);
 var r = c.foo(y);
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints2.js b/tests/baselines/reference/wrappedAndRecursiveConstraints2.js
index 4e752fd7ac349..ae8b28c5eb0ab 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints2.js
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints2.js
@@ -11,6 +11,6 @@ var C = (function () {
     function C(x) {
     }
     return C;
-})();
+}());
 var c = new C(1);
 var c = new C(new C('')); // error
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints3.js b/tests/baselines/reference/wrappedAndRecursiveConstraints3.js
index fb0f5388aaaba..b5d6e65a1832a 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints3.js
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints3.js
@@ -27,7 +27,7 @@ var C = (function () {
         return bar;
     };
     return C;
-})();
+}());
 var c = new C({ length: 2 });
 var r = c.foo({ length: 3, charAt: function (x) {
         '';
diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints4.js b/tests/baselines/reference/wrappedAndRecursiveConstraints4.js
index 998c16a9f87d0..2a84f8cc4262c 100644
--- a/tests/baselines/reference/wrappedAndRecursiveConstraints4.js
+++ b/tests/baselines/reference/wrappedAndRecursiveConstraints4.js
@@ -24,7 +24,7 @@ var C = (function () {
         return bar;
     };
     return C;
-})();
+}());
 var c = new C({ length: 2 });
 var r = c.foo('');
 var r2 = r({ length: 3, charAt: function (x) {

From 0c4ac799d98587bb15b9a78fc6fe2e41ba466f2f Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 8 Dec 2015 17:52:06 -0800
Subject: [PATCH 4/7] Accepted project baselines.

---
 .../project/declarationsCascadingImports/amd/m4.js        | 2 +-
 .../project/declarationsCascadingImports/node/m4.js       | 2 +-
 .../project/declarationsGlobalImport/amd/glo_m4.js        | 2 +-
 .../project/declarationsGlobalImport/node/glo_m4.js       | 2 +-
 .../declarationsImportedInPrivate/amd/private_m4.js       | 2 +-
 .../declarationsImportedInPrivate/node/private_m4.js      | 2 +-
 .../declarationsImportedUseInFunction/amd/fncOnly_m4.js   | 2 +-
 .../declarationsImportedUseInFunction/node/fncOnly_m4.js  | 2 +-
 .../amd/m4.js                                             | 2 +-
 .../node/m4.js                                            | 2 +-
 .../project/declarationsMultipleTimesImport/amd/m4.js     | 2 +-
 .../project/declarationsMultipleTimesImport/node/m4.js    | 2 +-
 .../declarationsMultipleTimesMultipleImport/amd/m4.js     | 2 +-
 .../declarationsMultipleTimesMultipleImport/node/m4.js    | 2 +-
 .../reference/project/declarationsSimpleImport/amd/m4.js  | 2 +-
 .../reference/project/declarationsSimpleImport/node/m4.js | 2 +-
 ...apRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/ref/m1.js                                         | 2 +-
 ...apRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...olutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 4 ++--
 ...olutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/bin/outAndOutDirFile.js                           | 6 +++---
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++---
 .../node/bin/outAndOutDirFile.js                          | 4 ++--
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++--
 ...ootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/ref/m1.js                                         | 2 +-
 ...ootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...tePathModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js     | 2 +-
 .../mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++--
 .../mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js    | 2 +-
 .../mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++--
 ...tePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...tePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...bsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 ...pRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...pRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../node/ref/m1.js                                        | 2 +-
 ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...lutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt  | 6 +++---
 .../mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js  | 2 +-
 .../mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt  | 6 +++---
 .../mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js | 2 +-
 ...utePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/outputdir_multifolder/ref/m1.js     | 2 +-
 ...utePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/outputdir_multifolder/ref/m1.js    | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...AbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 6 +++---
 ...AbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js   | 2 +-
 .../amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt   | 4 ++--
 .../project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js  | 2 +-
 .../node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt  | 4 ++--
 ...AbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...AbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...pRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 ...pRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt   | 2 +-
 .../mapRootAbsolutePathSingleFileNoOutdir/amd/test.js     | 2 +-
 .../mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt   | 2 +-
 .../mapRootAbsolutePathSingleFileNoOutdir/node/test.js    | 2 +-
 ...lutePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../amd/outdir/simple/test.js                             | 2 +-
 ...lutePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../node/outdir/simple/test.js                            | 2 +-
 .../amd/bin/test.js                                       | 2 +-
 ...tAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../node/bin/test.js                                      | 2 +-
 ...tAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt    | 4 ++--
 .../mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js    | 2 +-
 .../mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt    | 4 ++--
 .../mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js   | 2 +-
 ...olutePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...olutePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...otAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 ...otAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 ...apRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/ref/m1.js                                         | 2 +-
 ...apRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...ativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 4 ++--
 ...ativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/bin/outAndOutDirFile.js                           | 6 +++---
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++---
 .../node/bin/outAndOutDirFile.js                          | 4 ++--
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++--
 ...ootRelativePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/ref/m1.js                                         | 2 +-
 ...ootRelativePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...vePathModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js     | 2 +-
 .../mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++--
 .../mapRootRelativePathModuleSimpleNoOutdir/node/m1.js    | 2 +-
 .../mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++--
 ...vePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...vePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...elativePathModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 ...pRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...pRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../node/ref/m1.js                                        | 2 +-
 ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...tivePathModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../mapRootRelativePathMultifolderNoOutdir.sourcemap.txt  | 6 +++---
 .../mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js  | 2 +-
 .../mapRootRelativePathMultifolderNoOutdir.sourcemap.txt  | 6 +++---
 .../mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js | 2 +-
 ...ivePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/outputdir_multifolder/ref/m1.js     | 2 +-
 ...ivePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/outputdir_multifolder/ref/m1.js    | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...RelativePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 6 +++---
 ...RelativePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../project/mapRootRelativePathSimpleNoOutdir/amd/m1.js   | 2 +-
 .../amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt   | 4 ++--
 .../project/mapRootRelativePathSimpleNoOutdir/node/m1.js  | 2 +-
 .../node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt  | 4 ++--
 ...RelativePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...RelativePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...pRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 ...pRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../mapRootRelativePathSingleFileNoOutdir.sourcemap.txt   | 2 +-
 .../mapRootRelativePathSingleFileNoOutdir/amd/test.js     | 2 +-
 .../mapRootRelativePathSingleFileNoOutdir.sourcemap.txt   | 2 +-
 .../mapRootRelativePathSingleFileNoOutdir/node/test.js    | 2 +-
 ...tivePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../amd/outdir/simple/test.js                             | 2 +-
 ...tivePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../node/outdir/simple/test.js                            | 2 +-
 .../amd/bin/test.js                                       | 2 +-
 ...tRelativePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../node/bin/test.js                                      | 2 +-
 ...tRelativePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../mapRootRelativePathSubfolderNoOutdir.sourcemap.txt    | 4 ++--
 .../mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js    | 2 +-
 .../mapRootRelativePathSubfolderNoOutdir.sourcemap.txt    | 4 ++--
 .../mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js   | 2 +-
 ...ativePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...ativePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...otRelativePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 ...otRelativePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt    | 6 +++---
 .../maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js        | 2 +-
 .../node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt   | 6 +++---
 .../maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js       | 2 +-
 ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...aprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 4 ++--
 ...aprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/bin/outAndOutDirFile.js                           | 6 +++---
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++---
 .../node/bin/outAndOutDirFile.js                          | 4 ++--
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js     | 2 +-
 .../maprootUrlModuleMultifolderNoOutdir.sourcemap.txt     | 6 +++---
 .../maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js    | 2 +-
 ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...ootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../project/maprootUrlModuleSimpleNoOutdir/amd/m1.js      | 2 +-
 .../amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt      | 4 ++--
 .../project/maprootUrlModuleSimpleNoOutdir/node/m1.js     | 2 +-
 .../node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt     | 4 ++--
 ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 .../maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt   | 4 ++--
 .../maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js       | 2 +-
 .../node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt  | 4 ++--
 .../maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js      | 2 +-
 ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...prootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/maprootUrlMultifolderNoOutdir.sourcemap.txt       | 6 +++---
 .../project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js   | 2 +-
 .../node/maprootUrlMultifolderNoOutdir.sourcemap.txt      | 6 +++---
 .../project/maprootUrlMultifolderNoOutdir/node/ref/m1.js  | 2 +-
 ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/outputdir_multifolder/ref/m1.js     | 2 +-
 ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/outputdir_multifolder/ref/m1.js    | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 .../maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt  | 6 +++---
 .../node/bin/test.js                                      | 6 +++---
 .../maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt  | 6 +++---
 .../reference/project/maprootUrlSimpleNoOutdir/amd/m1.js  | 2 +-
 .../amd/maprootUrlSimpleNoOutdir.sourcemap.txt            | 4 ++--
 .../reference/project/maprootUrlSimpleNoOutdir/node/m1.js | 2 +-
 .../node/maprootUrlSimpleNoOutdir.sourcemap.txt           | 4 ++--
 .../maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt  | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 .../maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt  | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 .../maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js     | 4 ++--
 .../amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt   | 4 ++--
 .../maprootUrlSimpleSpecifyOutputFile/node/bin/test.js    | 4 ++--
 .../node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt  | 4 ++--
 .../amd/maprootUrlSingleFileNoOutdir.sourcemap.txt        | 2 +-
 .../project/maprootUrlSingleFileNoOutdir/amd/test.js      | 2 +-
 .../node/maprootUrlSingleFileNoOutdir.sourcemap.txt       | 2 +-
 .../project/maprootUrlSingleFileNoOutdir/node/test.js     | 2 +-
 ...prootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../amd/outdir/simple/test.js                             | 2 +-
 ...prootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../node/outdir/simple/test.js                            | 2 +-
 .../maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js | 2 +-
 .../maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt   | 2 +-
 .../node/bin/test.js                                      | 2 +-
 .../maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt   | 2 +-
 .../amd/maprootUrlSubfolderNoOutdir.sourcemap.txt         | 4 ++--
 .../project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js     | 2 +-
 .../node/maprootUrlSubfolderNoOutdir.sourcemap.txt        | 4 ++--
 .../project/maprootUrlSubfolderNoOutdir/node/ref/m1.js    | 2 +-
 ...aprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...aprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js  | 4 ++--
 .../maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt    | 4 ++--
 .../maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js | 4 ++--
 .../maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt    | 4 ++--
 ...otUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/ref/m1.js                                         | 2 +-
 ...otUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...cerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 4 ++--
 ...cerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/bin/outAndOutDirFile.js                           | 6 +++---
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++---
 .../node/bin/outAndOutDirFile.js                          | 4 ++--
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++--
 ...rlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/ref/m1.js                                         | 2 +-
 ...rlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...ootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js | 2 +-
 ...rootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt | 4 ++--
 .../node/m1.js                                            | 2 +-
 ...rootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt | 4 ++--
 ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...urcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 ...tUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...tUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../node/ref/m1.js                                        | 2 +-
 ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...erootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 ...prootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/ref/m1.js                                         | 2 +-
 ...prootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/outputdir_multifolder/ref/m1.js     | 2 +-
 ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/outputdir_multifolder/ref/m1.js    | 2 +-
 .../amd/bin/test.js                                       | 6 +++---
 ...ourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 6 +++---
 ...ourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js       | 2 +-
 .../maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt   | 4 ++--
 .../maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js      | 2 +-
 .../maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt   | 4 ++--
 ...ourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...ourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...tUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 ...tUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 ...aprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt | 2 +-
 .../maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js | 2 +-
 ...aprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt | 2 +-
 .../node/test.js                                          | 2 +-
 ...erootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../amd/outdir/simple/test.js                             | 2 +-
 ...erootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../node/outdir/simple/test.js                            | 2 +-
 .../amd/bin/test.js                                       | 2 +-
 ...sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../node/bin/test.js                                      | 2 +-
 ...sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 ...maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../node/ref/m1.js                                        | 2 +-
 ...cerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...cerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../amd/bin/test.js                                       | 4 ++--
 ...lsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 ...lsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../project/outMixedSubfolderNoOutdir/amd/ref/m1.js       | 2 +-
 .../project/outMixedSubfolderNoOutdir/node/ref/m1.js      | 2 +-
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../outMixedSubfolderSpecifyOutputFile/amd/bin/test.js    | 6 +++---
 .../outMixedSubfolderSpecifyOutputFile/node/bin/test.js   | 4 ++--
 .../amd/bin/outAndOutDirFile.js                           | 6 +++---
 .../node/bin/outAndOutDirFile.js                          | 4 ++--
 .../project/outModuleMultifolderNoOutdir/amd/ref/m1.js    | 2 +-
 .../project/outModuleMultifolderNoOutdir/node/ref/m1.js   | 2 +-
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 .../outModuleMultifolderSpecifyOutputFile/amd/bin/test.js | 6 +++---
 .../reference/project/outModuleSimpleNoOutdir/amd/m1.js   | 2 +-
 .../reference/project/outModuleSimpleNoOutdir/node/m1.js  | 2 +-
 .../amd/outdir/simple/m1.js                               | 2 +-
 .../node/outdir/simple/m1.js                              | 2 +-
 .../outModuleSimpleSpecifyOutputFile/amd/bin/test.js      | 4 ++--
 .../project/outModuleSubfolderNoOutdir/amd/ref/m1.js      | 2 +-
 .../project/outModuleSubfolderNoOutdir/node/ref/m1.js     | 2 +-
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../outModuleSubfolderSpecifyOutputFile/amd/bin/test.js   | 4 ++--
 .../project/outMultifolderNoOutdir/amd/ref/m1.js          | 2 +-
 .../project/outMultifolderNoOutdir/node/ref/m1.js         | 2 +-
 .../amd/outdir/simple/outputdir_multifolder/ref/m1.js     | 2 +-
 .../node/outdir/simple/outputdir_multifolder/ref/m1.js    | 2 +-
 .../outMultifolderSpecifyOutputFile/amd/bin/test.js       | 6 +++---
 .../outMultifolderSpecifyOutputFile/node/bin/test.js      | 6 +++---
 .../reference/project/outSimpleNoOutdir/amd/m1.js         | 2 +-
 .../reference/project/outSimpleNoOutdir/node/m1.js        | 2 +-
 .../amd/outdir/simple/m1.js                               | 2 +-
 .../node/outdir/simple/m1.js                              | 2 +-
 .../project/outSimpleSpecifyOutputFile/amd/bin/test.js    | 4 ++--
 .../project/outSimpleSpecifyOutputFile/node/bin/test.js   | 4 ++--
 .../reference/project/outSingleFileNoOutdir/amd/test.js   | 2 +-
 .../reference/project/outSingleFileNoOutdir/node/test.js  | 2 +-
 .../amd/outdir/simple/test.js                             | 2 +-
 .../node/outdir/simple/test.js                            | 2 +-
 .../outSingleFileSpecifyOutputFile/amd/bin/test.js        | 2 +-
 .../outSingleFileSpecifyOutputFile/node/bin/test.js       | 2 +-
 .../reference/project/outSubfolderNoOutdir/amd/ref/m1.js  | 2 +-
 .../reference/project/outSubfolderNoOutdir/node/ref/m1.js | 2 +-
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 .../project/outSubfolderSpecifyOutputFile/amd/bin/test.js | 4 ++--
 .../outSubfolderSpecifyOutputFile/node/bin/test.js        | 4 ++--
 .../amd/testGlo.js                                        | 8 ++++----
 .../node/testGlo.js                                       | 8 ++++----
 tests/baselines/reference/project/prologueEmit/amd/out.js | 4 ++--
 .../baselines/reference/project/prologueEmit/node/out.js  | 4 ++--
 .../quotesInFileAndDirectoryNames/amd/li'b/class'A.js     | 2 +-
 .../quotesInFileAndDirectoryNames/node/li'b/class'A.js    | 2 +-
 .../referenceResolutionRelativePaths/amd/diskFile0.js     | 2 +-
 .../referenceResolutionRelativePaths/node/diskFile0.js    | 2 +-
 .../amd/bar/bar.js                                        | 2 +-
 .../node/bar/bar.js                                       | 2 +-
 .../referenceResolutionRelativePathsNoResolve/amd/foo.js  | 2 +-
 .../referenceResolutionRelativePathsNoResolve/node/foo.js | 2 +-
 .../amd/diskFile0.js                                      | 2 +-
 .../node/diskFile0.js                                     | 2 +-
 .../project/referenceResolutionSameFileTwice/amd/test.js  | 2 +-
 .../project/referenceResolutionSameFileTwice/node/test.js | 2 +-
 .../referenceResolutionSameFileTwiceNoResolve/amd/test.js | 2 +-
 .../node/test.js                                          | 2 +-
 .../amd/outdir/simple/FolderB/FolderC/fileC.js            | 2 +-
 .../project/rootDirectory/amd/rootDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/FolderB/FolderC/fileC.js           | 2 +-
 .../rootDirectory/node/rootDirectory.sourcemap.txt        | 4 ++--
 .../amd/outdir/simple/FolderC/fileC.js                    | 2 +-
 .../node/outdir/simple/FolderC/fileC.js                   | 2 +-
 .../amd/outdir/simple/FolderB/FolderC/fileC.js            | 2 +-
 .../amd/rootDirectoryWithSourceRoot.sourcemap.txt         | 4 ++--
 .../node/outdir/simple/FolderB/FolderC/fileC.js           | 2 +-
 .../node/rootDirectoryWithSourceRoot.sourcemap.txt        | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...ceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...ceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...olutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 4 ++--
 ...olutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/bin/outAndOutDirFile.js                           | 6 +++---
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++---
 .../node/bin/outAndOutDirFile.js                          | 4 ++--
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...ootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...ootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...tePathModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js  | 2 +-
 ...urceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++--
 .../sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js | 2 +-
 ...urceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...tePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 ...tePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...bsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...eRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../node/ref/m1.js                                        | 2 +-
 ...eRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...lutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...ourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...ourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/outputdir_multifolder/ref/m1.js     | 2 +-
 ...utePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/outputdir_multifolder/ref/m1.js    | 2 +-
 ...utePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...AbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 6 +++---
 ...AbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js        | 2 +-
 .../sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt    | 4 ++--
 .../sourceRootAbsolutePathSimpleNoOutdir/node/m1.js       | 2 +-
 .../sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt    | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...AbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 ...AbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...eRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 ...eRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 ...sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt | 2 +-
 .../sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js  | 2 +-
 ...sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt | 2 +-
 .../sourceRootAbsolutePathSingleFileNoOutdir/node/test.js | 2 +-
 .../amd/outdir/simple/test.js                             | 2 +-
 ...lutePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../node/outdir/simple/test.js                            | 2 +-
 ...lutePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../amd/bin/test.js                                       | 2 +-
 ...tAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../node/bin/test.js                                      | 2 +-
 ...tAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js | 2 +-
 .../sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../node/ref/m1.js                                        | 2 +-
 .../sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...olutePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...olutePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...otAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 ...otAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...ceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...ceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...PathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...ativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 4 ++--
 ...ativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/bin/outAndOutDirFile.js                           | 6 +++---
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++---
 .../node/bin/outAndOutDirFile.js                          | 4 ++--
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...ootRelativePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...ootRelativePathModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...hModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...vePathModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js  | 2 +-
 ...urceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++--
 .../sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js | 2 +-
 ...urceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...vePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 ...vePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...elativePathModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...eRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../node/ref/m1.js                                        | 2 +-
 ...eRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...athModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...tivePathModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/ref/m1.js                                         | 2 +-
 ...ourceRootRelativePathMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../node/ref/m1.js                                        | 2 +-
 ...ourceRootRelativePathMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../amd/outdir/simple/outputdir_multifolder/ref/m1.js     | 2 +-
 ...ivePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/outputdir_multifolder/ref/m1.js    | 2 +-
 ...ivePathMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...RelativePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 6 +++---
 ...RelativePathMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../sourceRootRelativePathSimpleNoOutdir/amd/m1.js        | 2 +-
 .../sourceRootRelativePathSimpleNoOutdir.sourcemap.txt    | 4 ++--
 .../sourceRootRelativePathSimpleNoOutdir/node/m1.js       | 2 +-
 .../sourceRootRelativePathSimpleNoOutdir.sourcemap.txt    | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...RelativePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 ...RelativePathSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...eRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 ...eRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 ...sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt | 2 +-
 .../sourceRootRelativePathSingleFileNoOutdir/amd/test.js  | 2 +-
 ...sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt | 2 +-
 .../sourceRootRelativePathSingleFileNoOutdir/node/test.js | 2 +-
 .../amd/outdir/simple/test.js                             | 2 +-
 ...tivePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../node/outdir/simple/test.js                            | 2 +-
 ...tivePathSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../amd/bin/test.js                                       | 2 +-
 ...tRelativePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../node/bin/test.js                                      | 2 +-
 ...tRelativePathSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js | 2 +-
 .../sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../node/ref/m1.js                                        | 2 +-
 .../sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...ativePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...ativePathSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...otRelativePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 ...otRelativePathSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js | 2 +-
 .../amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt     | 6 +++---
 .../sourcemapMixedSubfolderNoOutdir/node/ref/m1.js        | 2 +-
 .../node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt    | 6 +++---
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...emapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...emapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 4 ++--
 ...sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/bin/outAndOutDirFile.js                           | 6 +++---
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++---
 .../node/bin/outAndOutDirFile.js                          | 4 ++--
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++--
 .../sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js      | 2 +-
 .../amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt  | 6 +++---
 .../sourcemapModuleMultifolderNoOutdir/node/ref/m1.js     | 2 +-
 .../node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...pModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...pModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...rcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../project/sourcemapModuleSimpleNoOutdir/amd/m1.js       | 2 +-
 .../amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt       | 4 ++--
 .../project/sourcemapModuleSimpleNoOutdir/node/m1.js      | 2 +-
 .../node/sourcemapModuleSimpleNoOutdir.sourcemap.txt      | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...rcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 ...rcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 .../sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt  | 4 ++--
 .../sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js        | 2 +-
 .../amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt    | 4 ++--
 .../sourcemapModuleSubfolderNoOutdir/node/ref/m1.js       | 2 +-
 .../node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt   | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...mapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...mapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...ourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../project/sourcemapMultifolderNoOutdir/amd/ref/m1.js    | 2 +-
 .../amd/sourcemapMultifolderNoOutdir.sourcemap.txt        | 6 +++---
 .../project/sourcemapMultifolderNoOutdir/node/ref/m1.js   | 2 +-
 .../node/sourcemapMultifolderNoOutdir.sourcemap.txt       | 6 +++---
 .../amd/outdir/simple/outputdir_multifolder/ref/m1.js     | 2 +-
 ...urcemapMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/outputdir_multifolder/ref/m1.js    | 2 +-
 ...urcemapMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js | 6 +++---
 .../sourcemapMultifolderSpecifyOutputFile.sourcemap.txt   | 6 +++---
 .../node/bin/test.js                                      | 6 +++---
 .../sourcemapMultifolderSpecifyOutputFile.sourcemap.txt   | 6 +++---
 .../reference/project/sourcemapSimpleNoOutdir/amd/m1.js   | 2 +-
 .../amd/sourcemapSimpleNoOutdir.sourcemap.txt             | 4 ++--
 .../reference/project/sourcemapSimpleNoOutdir/node/m1.js  | 2 +-
 .../node/sourcemapSimpleNoOutdir.sourcemap.txt            | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 .../sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt   | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 .../sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt   | 4 ++--
 .../sourcemapSimpleSpecifyOutputFile/amd/bin/test.js      | 4 ++--
 .../amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt    | 4 ++--
 .../sourcemapSimpleSpecifyOutputFile/node/bin/test.js     | 4 ++--
 .../node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt   | 4 ++--
 .../amd/sourcemapSingleFileNoOutdir.sourcemap.txt         | 2 +-
 .../project/sourcemapSingleFileNoOutdir/amd/test.js       | 2 +-
 .../node/sourcemapSingleFileNoOutdir.sourcemap.txt        | 2 +-
 .../project/sourcemapSingleFileNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/test.js                             | 2 +-
 ...ourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../node/outdir/simple/test.js                            | 2 +-
 ...ourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js  | 2 +-
 .../sourcemapSingleFileSpecifyOutputFile.sourcemap.txt    | 2 +-
 .../sourcemapSingleFileSpecifyOutputFile/node/bin/test.js | 2 +-
 .../sourcemapSingleFileSpecifyOutputFile.sourcemap.txt    | 2 +-
 .../project/sourcemapSubfolderNoOutdir/amd/ref/m1.js      | 2 +-
 .../amd/sourcemapSubfolderNoOutdir.sourcemap.txt          | 4 ++--
 .../project/sourcemapSubfolderNoOutdir/node/ref/m1.js     | 2 +-
 .../node/sourcemapSubfolderNoOutdir.sourcemap.txt         | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js   | 4 ++--
 .../amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../sourcemapSubfolderSpecifyOutputFile/node/bin/test.js  | 4 ++--
 .../sourcemapSubfolderSpecifyOutputFile.sourcemap.txt     | 4 ++--
 .../sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js     | 2 +-
 .../amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt | 6 +++---
 .../sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js    | 2 +-
 .../sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt     | 6 +++---
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...tUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...cerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 4 ++--
 ...cerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../amd/bin/outAndOutDirFile.js                           | 6 +++---
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 6 +++---
 .../node/bin/outAndOutDirFile.js                          | 4 ++--
 ...olderSpecifyOutputFileAndOutputDirectory.sourcemap.txt | 4 ++--
 .../sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js  | 2 +-
 .../sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt  | 6 +++---
 .../sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js | 2 +-
 .../sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt  | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../outdir/simple/outputdir_module_multifolder/ref/m1.js  | 2 +-
 ...lModuleMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...ootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js   | 2 +-
 .../amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt   | 4 ++--
 .../project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js  | 2 +-
 .../node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt  | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 ...ootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...urcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js    | 2 +-
 .../sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt    | 4 ++--
 .../sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js   | 2 +-
 .../sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt    | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...UrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 ...erootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js        | 2 +-
 .../amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt    | 6 +++---
 .../sourcerootUrlMultifolderNoOutdir/node/ref/m1.js       | 2 +-
 .../node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt   | 6 +++---
 .../amd/outdir/simple/outputdir_multifolder/ref/m1.js     | 2 +-
 ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../node/outdir/simple/outputdir_multifolder/ref/m1.js    | 2 +-
 ...rootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt | 6 +++---
 .../amd/bin/test.js                                       | 6 +++---
 ...ourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../node/bin/test.js                                      | 6 +++---
 ...ourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt | 6 +++---
 .../project/sourcerootUrlSimpleNoOutdir/amd/m1.js         | 2 +-
 .../amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt         | 4 ++--
 .../project/sourcerootUrlSimpleNoOutdir/node/m1.js        | 2 +-
 .../node/sourcerootUrlSimpleNoOutdir.sourcemap.txt        | 4 ++--
 .../amd/outdir/simple/m1.js                               | 2 +-
 ...ourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/m1.js                              | 2 +-
 ...ourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js  | 4 ++--
 .../sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt    | 4 ++--
 .../sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js | 4 ++--
 .../sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt    | 4 ++--
 .../amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt     | 2 +-
 .../project/sourcerootUrlSingleFileNoOutdir/amd/test.js   | 2 +-
 .../node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt    | 2 +-
 .../project/sourcerootUrlSingleFileNoOutdir/node/test.js  | 2 +-
 .../amd/outdir/simple/test.js                             | 2 +-
 ...erootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../node/outdir/simple/test.js                            | 2 +-
 ...erootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt | 2 +-
 .../amd/bin/test.js                                       | 2 +-
 ...sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../node/bin/test.js                                      | 2 +-
 ...sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt | 2 +-
 .../project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js  | 2 +-
 .../amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt      | 4 ++--
 .../project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js | 2 +-
 .../node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt     | 4 ++--
 .../amd/outdir/simple/ref/m1.js                           | 2 +-
 ...cerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../node/outdir/simple/ref/m1.js                          | 2 +-
 ...cerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt | 4 ++--
 .../amd/bin/test.js                                       | 4 ++--
 .../sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../node/bin/test.js                                      | 4 ++--
 .../sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt | 4 ++--
 .../project/visibilityOfTypeUsedAcrossModules/amd/fs.js   | 2 +-
 .../project/visibilityOfTypeUsedAcrossModules/node/fs.js  | 2 +-
 845 files changed, 1483 insertions(+), 1483 deletions(-)

diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
index 1d46a3ca30270..bb607f4b5b089 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
@@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) {
         function d() {
         }
         return d;
-    })();
+    }());
     exports.d = d;
     ;
     function foo() {
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
index 505e7d74da84f..52ecf390373e8 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
@@ -3,7 +3,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 ;
 function foo() {
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
index 1d46a3ca30270..bb607f4b5b089 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
@@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) {
         function d() {
         }
         return d;
-    })();
+    }());
     exports.d = d;
     ;
     function foo() {
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
index 505e7d74da84f..52ecf390373e8 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
@@ -3,7 +3,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 ;
 function foo() {
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
index 1d46a3ca30270..bb607f4b5b089 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
@@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) {
         function d() {
         }
         return d;
-    })();
+    }());
     exports.d = d;
     ;
     function foo() {
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
index 505e7d74da84f..52ecf390373e8 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
@@ -3,7 +3,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 ;
 function foo() {
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
index 1d46a3ca30270..bb607f4b5b089 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
@@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) {
         function d() {
         }
         return d;
-    })();
+    }());
     exports.d = d;
     ;
     function foo() {
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
index 505e7d74da84f..52ecf390373e8 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
@@ -3,7 +3,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 ;
 function foo() {
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
index 1d46a3ca30270..bb607f4b5b089 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
@@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) {
         function d() {
         }
         return d;
-    })();
+    }());
     exports.d = d;
     ;
     function foo() {
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
index 505e7d74da84f..52ecf390373e8 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
@@ -3,7 +3,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 ;
 function foo() {
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
index 1d46a3ca30270..bb607f4b5b089 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
@@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) {
         function d() {
         }
         return d;
-    })();
+    }());
     exports.d = d;
     ;
     function foo() {
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
index 505e7d74da84f..52ecf390373e8 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
@@ -3,7 +3,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 ;
 function foo() {
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
index 1d46a3ca30270..bb607f4b5b089 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
@@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) {
         function d() {
         }
         return d;
-    })();
+    }());
     exports.d = d;
     ;
     function foo() {
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
index 505e7d74da84f..52ecf390373e8 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
@@ -3,7 +3,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 ;
 function foo() {
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
index 1d46a3ca30270..bb607f4b5b089 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
@@ -4,7 +4,7 @@ define(["require", "exports"], function (require, exports) {
         function d() {
         }
         return d;
-    })();
+    }());
     exports.d = d;
     ;
     function foo() {
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
index 505e7d74da84f..52ecf390373e8 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
@@ -3,7 +3,7 @@ var d = (function () {
     function d() {
     }
     return d;
-})();
+}());
 exports.d = d;
 ;
 function foo() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
index a72b4af337b06..6a3d66ff9202b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:../../ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js
index 80c5ac103c959..b27cc353db503 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
index 062e42a5e5f64..90f439ae62e66 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:../../ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js
index 80c5ac103c959..b27cc353db503 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 0dd9d248ed8ff..5568b3b59cc75 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:../../ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 80c5ac103c959..b27cc353db503 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 4d2bfe895593b..146568254f8bb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:../../ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 80c5ac103c959..b27cc353db503 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 75f7b767aeabe..3dd9960df1406 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 90faa19dd08c4..ac740512f7dd0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:../ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:../test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
index 7ef36232b8dd5..a857aef135a55 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 783a11edfd4c3..3a3cdb547f594 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:../test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 67d1060440510..ccf78301cb101 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index e772acc4db4df..0dfcd7002be8d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:../ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:../test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
index fc53d59d7cb38..feea00eb8c72a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 67d311777c13a..4ff78d4d802d7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:../test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
index c62d96fdcce78..3d3d83e86043e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 2285204e0bdb9..b663057aeff2e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
index d38a02260acf5..f9461bb3244c4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:../../test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index 31565374f87a1..7ad78d4877d27 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 31e8687a0ea43..672a3d34ea766 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 2285204e0bdb9..b663057aeff2e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index a3f617af03e25..d75a1f63f6c62 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:../../test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 31565374f87a1..7ad78d4877d27 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index a5ff923efe0d5..29bc22bd61c65 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index d495eb0760722..4358711b5b53a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -227,7 +227,7 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts
 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:../test.ts
 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2)
 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index 684b6e489f78b..3017cac2b882f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
index e546405911bc2..aea9cbc53b3cb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:../test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index 284d58acdad3e..efdf4bd9a30ef 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
index dcb2c860ca096..c62d5b213f752 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:../test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 87a12bd64cf47..f211848499384 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:../test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 684b6e489f78b..3017cac2b882f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index ff6b403823d89..e650d39612bc7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:../test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 284d58acdad3e..efdf4bd9a30ef 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 3dc74b12b3d77..d3a752a0ee49a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 8797275bcdad8..019ae2bd0aada 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:../test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
index 737f15bf08c95..425fd381ad68d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:../test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 24ff184b236b5..13158547401c2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
index b5706736604f7..94024fb5deb46 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:../test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 277943cc80d60..80d76037a7f07 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index ce3e6a112d2cc..c5eecc3b50f7c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:../test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 24ff184b236b5..13158547401c2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 0ce6c34b1a33a..be825d37963e7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:../test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 277943cc80d60..80d76037a7f07 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 44b0801e558e9..d20feb624babc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 0eade6b6f8fb9..3777aaad545d0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:../test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
index 1c3193cbd2010..5ea98f50d2d83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js
index 77245d4717bd4..6e43f21bdb1aa 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
index 1c3193cbd2010..5ea98f50d2d83 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js
index 77245d4717bd4..6e43f21bdb1aa 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index 7e1b50667b884..63c897e4e57b1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
index 77245d4717bd4..6e43f21bdb1aa 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index 7e1b50667b884..63c897e4e57b1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:../../../outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
index 77245d4717bd4..6e43f21bdb1aa 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js
index cbcbe0469613a..f658a89ca9dc7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
index 1d83cb2c7344e..e22b9099a6f3f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:../test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js
index cbcbe0469613a..f658a89ca9dc7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
index 1d83cb2c7344e..e22b9099a6f3f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:../test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js
index 5139d59fad093..959473054178c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
index 3098d176ceee3..6aabde300798b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js
index 5139d59fad093..959473054178c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
index 3098d176ceee3..6aabde300798b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 39e884c2e811b..65b461791aadb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 5139d59fad093..959473054178c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 39e884c2e811b..65b461791aadb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 5139d59fad093..959473054178c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js
index 54a21de3149f5..5325afdbd55ec 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
index 809260bb3bf10..997e0b9d7b465 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js
index 54a21de3149f5..5325afdbd55ec 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
index 809260bb3bf10..997e0b9d7b465 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
index 78f3538ee65e7..f1b1b6d091675 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js
index c2399b3d0241b..f299e0d0080e1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
index 78f3538ee65e7..f1b1b6d091675 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js
index c2399b3d0241b..f299e0d0080e1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
index 4528840f69b7e..00d6a44bcf5f5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
index c2399b3d0241b..f299e0d0080e1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
index 4528840f69b7e..00d6a44bcf5f5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
index c2399b3d0241b..f299e0d0080e1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js
index c2399b3d0241b..f299e0d0080e1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
index ed57bdb6f1ede..35b71a7e9992c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js
index c2399b3d0241b..f299e0d0080e1 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
index ed57bdb6f1ede..35b71a7e9992c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
index 4834c4ee4c436..d4bc9c6831c63 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js
index 02f4c47bdc7f9..7d09551625eb7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
index 4834c4ee4c436..d4bc9c6831c63 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js
index 02f4c47bdc7f9..7d09551625eb7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index 186e55039a051..f166b50b85660 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 02f4c47bdc7f9..7d09551625eb7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index 186e55039a051..f166b50b85660 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 02f4c47bdc7f9..7d09551625eb7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js
index 561341ee534dd..275b5e2116b0d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
index 7958222249dd3..d1e7478e38481 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js
index 561341ee534dd..275b5e2116b0d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
index 7958222249dd3..d1e7478e38481 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
index 9d47375d9931a..757c3a44e794c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js
index 1317ac6574e32..e0e2af2b8629b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
index 647c7f30e3680..4a0ed5bf5e3f5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js
index 1317ac6574e32..e0e2af2b8629b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 93b67a6e3b208..210c6a0aad0d5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 33cf31f7700ee..e6670e7a300f0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 690652e709249..2fcffbeed8be8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:../../outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 33cf31f7700ee..e6670e7a300f0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 75131b5063047..043adb3dd6f17 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 15b9d4ff17d03..2d276f75b033a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
index c4c79e0454b7b..c93eed3c7d44c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 12ac5dd705030..d93d5e398e13d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 52e051d7ba0ac..b40b056b6d90c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index cc17592a88f77..1ad479bc3e389 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
index c0138423caee9..7ec08c6c0a9cb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 1d5041d6d00f9..a593271d04193 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:../outputdir_mixed_subfolder/test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
index 1a02d0ed75c31..5db83dfb530b2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 0a11d7abb9c1b..7ecd677009dd4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
index 2140f27c0823d..f0c44f724e632 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 6b59fb6f79c13..112ae7e706266 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 0c068b2496d15..38204c88261dd 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 57f346647510a..4d721e1be5dd0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 72f9ba10fc124..f6897055546a4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../../projects/outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:../../projects/outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 69476c5b6ca0e..a1d86ff185747 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9f8555682d6cb..01c28031d8a8c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index ee3b40dc2855b..55627ab1167af 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../projects/outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -227,7 +227,7 @@ sourceFile:../projects/outputdir_module_multifolder_ref/m2.ts
 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:../projects/outputdir_module_multifolder/test.ts
 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2)
 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index d34c484207f52..826510699a70e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
index 2a501a3a088d1..f5cf250260ffd 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../outputdir_module_simple/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:../outputdir_module_simple/test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
index bf342f3a0376b..123e89b6c8162 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
index d9a867d684930..04719a1aae2e8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../outputdir_module_simple/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:../outputdir_module_simple/test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index e4875c4f14625..3e9d27dcaa376 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../outputdir_module_simple/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:../outputdir_module_simple/test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 119c0d64430b8..415eb731ee6bb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index b2bf27e081ed1..b6dbaeb77b1a8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../outputdir_module_simple/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:../outputdir_module_simple/test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index dcf1e846993f8..4c96696726b76 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index a682a1f510dd9..1e43585f28104 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index ceb18caf153d4..fd0ca24c30c29 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../outputdir_module_simple/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:../outputdir_module_simple/test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
index 66a7c7430367f..8e75611fa4c71 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:../outputdir_module_subfolder/test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 8d3bff9f961e3..d7fc22ee9b33d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
index 62ee9347ba2d8..775700c9f0593 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:../outputdir_module_subfolder/test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index c9c1fc5a6d1a2..4423220831bd0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 857d197acb542..9c72e15b36d0e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:../outputdir_module_subfolder/test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 769504a9af899..447f2cb756d9d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 925c9368edd16..d694c5e237b69 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../outputdir_module_subfolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:../outputdir_module_subfolder/test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 34294f368ff54..b4b9b2dc7e047 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 88f1db4f33e63..23442cdbfa67f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 2bff7cdbda9d3..1fcadcb6c3d73 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../outputdir_module_subfolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:../outputdir_module_subfolder/test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
index e5bf488f3d0f0..5d88f4ea1e985 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js
index 2b547787de63f..48efad1d91c2b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
index e5bf488f3d0f0..5d88f4ea1e985 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js
index 2b547787de63f..48efad1d91c2b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index ea4571b517c60..8864cb3a00b83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
index a135e4b027862..490ac31736bcb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index ea4571b517c60..8864cb3a00b83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:../../projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:../../projects/outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
index a135e4b027862..490ac31736bcb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js
index acd2d113c02ce..52c907e93a878 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
index ec7a51000b428..b59dd72c6171c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:../projects/outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js
index acd2d113c02ce..52c907e93a878 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
index ec7a51000b428..b59dd72c6171c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:../projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:../projects/outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js
index 517ed8f64920d..027237fe764a9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
index 7c6f2c2513d71..7c35498a07a57 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../outputdir_simple/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js
index 517ed8f64920d..027237fe764a9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
index 7c6f2c2513d71..7c35498a07a57 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../outputdir_simple/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 9b5cee44e8803..3759897897369 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../outputdir_simple/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 41150949e29ca..9f57dc40bbbb7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 9b5cee44e8803..3759897897369 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../outputdir_simple/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 41150949e29ca..9f57dc40bbbb7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js
index 9d6f9d2bb0d44..9210e2c4fca8c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
index cdfe8381ab41e..50d88c5b21e9f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../outputdir_simple/test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js
index 9d6f9d2bb0d44..9210e2c4fca8c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
index cdfe8381ab41e..50d88c5b21e9f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../outputdir_simple/test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt
index 3c5a58c134c08..a283a5bc003f6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js
index 39ea4830920a6..6888a1e428fbd 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt
index 3c5a58c134c08..a283a5bc003f6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js
index 39ea4830920a6..6888a1e428fbd 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
index 1234777c9c133..ac697b960ffea 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
index ca051a06fbf95..2b699a8260f6d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
index 1234777c9c133..ac697b960ffea 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
index ca051a06fbf95..2b699a8260f6d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js
index f57e937148ebb..426a747ed22be 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
index 13278d30331ed..4960a310df0e8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js
index f57e937148ebb..426a747ed22be 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
index 13278d30331ed..4960a310df0e8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
index ce2229723a356..b3d5b6d206226 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../outputdir_subfolder/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js
index 1317ac6574e32..e0e2af2b8629b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
index ce2229723a356..b3d5b6d206226 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../outputdir_subfolder/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js
index 1317ac6574e32..e0e2af2b8629b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index 0e558e67ec2c0..c41e06ccfe42c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../outputdir_subfolder/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 33cf31f7700ee..e6670e7a300f0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index 0e558e67ec2c0..c41e06ccfe42c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../outputdir_subfolder/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 33cf31f7700ee..e6670e7a300f0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js
index a85935632ddea..30156e6cbcb72 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
index 673c6572b5677..079730ccaea24 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../outputdir_subfolder/test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js
index a85935632ddea..30156e6cbcb72 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
index 673c6572b5677..079730ccaea24 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../outputdir_subfolder/test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
index a01426e8cd6b2..dbfd034435858 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
index 096356e3054dd..442540b1d3b72 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index d4e3fde027e2d..fe156c8ba3061 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 058484f80f447..f586a84e5e6b9 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 03d1c2fc75073..b1f7d5f7329c3 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index d347c1a16a58e..364a5ead57e29 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js
index af0071d7e46a1..ec3309b3b1868 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index d4e651c5bc01f..01e66a8b57397 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 04fd25336f1a7..2cf202bd87109 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 0452361c2de3c..a1c569ca05657 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
index 2ebe138ffdaf8..3e51021ce9b48 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index b659a6c11c5ee..18f7ae479e233 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt
index 2a3f8d78e9474..71d04d5410525 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 0014eb3163c56..2141ed5cbb8f2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt
index 69e712ee56d4a..b30960959e013 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index e50be801bbf7b..651782fa42160 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 84dce11dc01af..15e3b5d99f336 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 0014eb3163c56..2141ed5cbb8f2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index dcf1fb70a43c3..87c6c9341d1f5 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index e50be801bbf7b..651782fa42160 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index a31b4d772ecaf..99da107dfa8df 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 829640b7bb102..c6dd4570b29e1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -227,7 +227,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts
 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2)
 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
index b2136c5cb5ed8..b85ad9ab5b153 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt
index 7d729a5661f73..e61a7e39edf1f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
index c8cf74001a865..9e79b0167c6eb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt
index f9261589ad04c..7b3b27278b28f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index a02c48506ef3b..b47d83c692016 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index b2136c5cb5ed8..b85ad9ab5b153 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 5109b2e31b013..bc75a6972d598 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index c8cf74001a865..9e79b0167c6eb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index b04aa2d4d46f5..4b21632bd6cbc 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index e45cacab12aea..a571162721b48 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt
index 1808b29753f6c..6af7d974bc4c9 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index 1819603381c8d..c3d36f22356c4 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt
index 340b73f57bb12..9b43f0d35d09d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index b594cf79eb2d6..8fe6d174601fb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index f26dc1e03bfd3..80882be8d58d3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1819603381c8d..c3d36f22356c4 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 4e4cb8a0cbbe4..ba8c64ade191f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index b594cf79eb2d6..8fe6d174601fb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 37aaeb4ecdacb..a58fc69531fe8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 5df60cdb06a97..084f7eb3bf05d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt
index 570fdc7051940..ad9f973f729e1 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js
index da8ac1cb063be..cf8964266818b 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt
index 570fdc7051940..ad9f973f729e1 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js
index da8ac1cb063be..cf8964266818b 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index 5d6bc0ed0429b..c75dab52c240b 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
index da8ac1cb063be..cf8964266818b 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index 5d6bc0ed0429b..c75dab52c240b 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
index da8ac1cb063be..cf8964266818b 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js
index b5641a2b2bd57..51bd53679fa11 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 36b0d16d1aa8b..3a2f01dd5e460 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js
index b5641a2b2bd57..51bd53679fa11 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 36b0d16d1aa8b..3a2f01dd5e460 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:file:///tests/cases/projects/outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js
index 24b75dc1a7e7a..9f5ca0320c929 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt
index 9da8ea4abed3b..52784c4e840ba 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js
index 24b75dc1a7e7a..9f5ca0320c929 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt
index 9da8ea4abed3b..52784c4e840ba 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index 17c7f707a841b..ab1c1686d84c8 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 24b75dc1a7e7a..9f5ca0320c929 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index 17c7f707a841b..ab1c1686d84c8 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 24b75dc1a7e7a..9f5ca0320c929 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js
index 869f4f5971a4b..2a35fde20dc3e 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
index 100a3db76a50b..4bc337647db3f 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js
index 869f4f5971a4b..2a35fde20dc3e 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
index 100a3db76a50b..4bc337647db3f 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:file:///tests/cases/projects/outputdir_simple/test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt
index 169448dbcc252..f1c0f5ef4c714 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt
index 169448dbcc252..f1c0f5ef4c714 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
index 92a8de1c6069b..62e13fc2153ab 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
index 92a8de1c6069b..62e13fc2153ab 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt
index b894437e6230a..d731ec71ca246 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt
index b894437e6230a..d731ec71ca246 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_singleFile/test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt
index aa943fface2e5..17e2a4ed7a2ee 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt
index aa943fface2e5..17e2a4ed7a2ee 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index f3b69f5c9d2ee..c9a20be707330 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index f3b69f5c9d2ee..c9a20be707330 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js
index 632070dbd6429..4b9e91859bfef 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index 15d09ffdb8918..4df5a29dcd8ee 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js
index 632070dbd6429..4b9e91859bfef 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index 15d09ffdb8918..4df5a29dcd8ee 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:file:///tests/cases/projects/outputdir_subfolder/test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
index b3f1a48628d52..bc8f23fea5c54 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
index 682c0afa6f04e..e5fd32b04358c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 3a8848af7cd96..bf37aa3d93e29 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 9e9c45bb2a214..9cfe0389ad818 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 03d1c2fc75073..b1f7d5f7329c3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index d3c8d277b998d..3f458619441ba 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js
index af0071d7e46a1..ec3309b3b1868 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 726cc1f8f73ee..800d3c15dbe0d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 04fd25336f1a7..2cf202bd87109 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 689a2a79281c1..580e372ac3b1f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
index 2ebe138ffdaf8..3e51021ce9b48 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 5d18153232237..68c732520a1f9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
index 492b858eaf445..c170dad96cc43 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 0014eb3163c56..2141ed5cbb8f2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
index ad8ab94e30de0..21398ede2aff2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index e50be801bbf7b..651782fa42160 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 83f02e725b4f2..7b857161a3139 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 0014eb3163c56..2141ed5cbb8f2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index db5a07b077d29..4b01b1f5ad6a5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index e50be801bbf7b..651782fa42160 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index a31b4d772ecaf..99da107dfa8df 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index c3f681d3691aa..dd28288d8e022 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -227,7 +227,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2)
 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index b2136c5cb5ed8..b85ad9ab5b153 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
index a7a2092c9cd30..d3608640de2ba 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
index c8cf74001a865..9e79b0167c6eb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
index 15a6a8bd07c34..8fa7e43f3d4dc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 4c6f3cd3d1338..dca2248f6493b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index b2136c5cb5ed8..b85ad9ab5b153 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index b593c1d166bdc..02c7fe0328c89 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index c8cf74001a865..9e79b0167c6eb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index b04aa2d4d46f5..4b21632bd6cbc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 61463651296a3..fec4c012c2be5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
index fd93b49350ee0..6f0d545509903 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index 1819603381c8d..c3d36f22356c4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
index abc32308f8801..48628ba399bd0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index b594cf79eb2d6..8fe6d174601fb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 2772b70cfbebc..cd2a9a8699559 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1819603381c8d..c3d36f22356c4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index beaf54a04de69..0572281f77918 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index b594cf79eb2d6..8fe6d174601fb 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 37aaeb4ecdacb..a58fc69531fe8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 2117db2d0b06b..e720aaa9215b5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
index ffce1098df610..e470a39f235cd 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js
index da8ac1cb063be..cf8964266818b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
index ffce1098df610..e470a39f235cd 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js
index da8ac1cb063be..cf8964266818b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index 3e7b4d1b21bb9..a1c7bf50c477a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
index da8ac1cb063be..cf8964266818b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index 3e7b4d1b21bb9..a1c7bf50c477a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
index da8ac1cb063be..cf8964266818b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js
index b5641a2b2bd57..51bd53679fa11 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 278bdb65bfc34..5e3fe895b88b1 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js
index b5641a2b2bd57..51bd53679fa11 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 278bdb65bfc34..5e3fe895b88b1 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js
index 24b75dc1a7e7a..9f5ca0320c929 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
index 7f41d24298398..b1ce5150ad1e8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js
index 24b75dc1a7e7a..9f5ca0320c929 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
index 7f41d24298398..b1ce5150ad1e8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index ef44bbeae905f..7b17d9804163b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 24b75dc1a7e7a..9f5ca0320c929 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index ef44bbeae905f..7b17d9804163b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 24b75dc1a7e7a..9f5ca0320c929 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js
index 869f4f5971a4b..2a35fde20dc3e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
index 72fc256960937..23ba392bf3a63 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js
index 869f4f5971a4b..2a35fde20dc3e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
index 72fc256960937..23ba392bf3a63 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt
index 5abd520cdaea9..c39a0fba5015a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt
index 5abd520cdaea9..c39a0fba5015a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
index df39c21af9eb7..e04f1bbe9c727 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
index df39c21af9eb7..e04f1bbe9c727 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
index a3604df7a9d99..7e18311cc3d05 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js
index bc0f3007e6a77..73eb738e590b7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
index a3604df7a9d99..7e18311cc3d05 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
index e909fa2b9d9ab..9391f8b064967 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
index e909fa2b9d9ab..9391f8b064967 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index 8d48c91668d75..c5760f4bd672a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index 8d48c91668d75..c5760f4bd672a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f01a67c727732..ac9c9fc5839b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js
index 632070dbd6429..4b9e91859bfef 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index a3eb3d49a399f..86c45fec17869 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js
index 632070dbd6429..4b9e91859bfef 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index a3eb3d49a399f..86c45fec17869 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index c7642c55d72ef..7898180c05028 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.js
index ad3b4896eecf8..d10738c12a690 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index c7642c55d72ef..7898180c05028 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
index ad3b4896eecf8..d10738c12a690 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
index 469ba2c199fb0..34936dca12554 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
index 01ed51fe662f1..5854acba9e287 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 469ba2c199fb0..34936dca12554 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 01ed51fe662f1..5854acba9e287 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index f4180b7873947..ea6ae0a3cd739 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
index 469ba2c199fb0..34936dca12554 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
index 01ed51fe662f1..5854acba9e287 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 469ba2c199fb0..34936dca12554 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 01ed51fe662f1..5854acba9e287 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 30a7145ab87e6..04f9d32831e2d 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
index 469ba2c199fb0..34936dca12554 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
index 01ed51fe662f1..5854acba9e287 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 469ba2c199fb0..34936dca12554 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 01ed51fe662f1..5854acba9e287 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 78afb5215e363..05ee275fc15e5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.js
index b6fc6ea83ff54..283a721170cb4 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.js
index b6fc6ea83ff54..283a721170cb4 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/outSimpleNoOutdir/amd/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/outSimpleNoOutdir/node/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.js
index 725379f28cc61..d739de3142b52 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.js
index 725379f28cc61..d739de3142b52 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.js
index ced5641081bc2..c3f455a08ce64 100644
--- a/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outSingleFileNoOutdir/amd/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.js
index ced5641081bc2..c3f455a08ce64 100644
--- a/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outSingleFileNoOutdir/node/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
index ced5641081bc2..c3f455a08ce64 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
index ced5641081bc2..c3f455a08ce64 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.js
index ced5641081bc2..c3f455a08ce64 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.js
index ced5641081bc2..c3f455a08ce64 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 2a78be9bc0793..a9ac9819faabc 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.js
index 8b15a01fa017c..0e00e79ca1fd9 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.js
index 8b15a01fa017c..0e00e79ca1fd9 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
index bab996e07a417..3b6e407d045c0 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
@@ -17,7 +17,7 @@ var m2;
             _super.apply(this, arguments);
         }
         return class1;
-    })(m2.mExported.me.class1);
+    }(m2.mExported.me.class1));
     m2.class1 = class1;
     var c2 = new m2.mExported.me.class1;
     function f2() {
@@ -30,7 +30,7 @@ var m2;
             _super.apply(this, arguments);
         }
         return class2;
-    })(m2.mExported.me.class1);
+    }(m2.mExported.me.class1));
     m2.c3 = new mNonExported.mne.class1;
     function f3() {
         return new mNonExported.mne.class1();
@@ -43,7 +43,7 @@ var m2;
             _super.apply(this, arguments);
         }
         return class3;
-    })(mNonExported.mne.class1);
+    }(mNonExported.mne.class1));
     m2.class3 = class3;
     var c4 = new mNonExported.mne.class1;
     function f4() {
@@ -56,5 +56,5 @@ var m2;
             _super.apply(this, arguments);
         }
         return class4;
-    })(mNonExported.mne.class1);
+    }(mNonExported.mne.class1));
 })(m2 || (m2 = {}));
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
index bab996e07a417..3b6e407d045c0 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
@@ -17,7 +17,7 @@ var m2;
             _super.apply(this, arguments);
         }
         return class1;
-    })(m2.mExported.me.class1);
+    }(m2.mExported.me.class1));
     m2.class1 = class1;
     var c2 = new m2.mExported.me.class1;
     function f2() {
@@ -30,7 +30,7 @@ var m2;
             _super.apply(this, arguments);
         }
         return class2;
-    })(m2.mExported.me.class1);
+    }(m2.mExported.me.class1));
     m2.c3 = new mNonExported.mne.class1;
     function f3() {
         return new mNonExported.mne.class1();
@@ -43,7 +43,7 @@ var m2;
             _super.apply(this, arguments);
         }
         return class3;
-    })(mNonExported.mne.class1);
+    }(mNonExported.mne.class1));
     m2.class3 = class3;
     var c4 = new mNonExported.mne.class1;
     function f4() {
@@ -56,5 +56,5 @@ var m2;
             _super.apply(this, arguments);
         }
         return class4;
-    })(mNonExported.mne.class1);
+    }(mNonExported.mne.class1));
 })(m2 || (m2 = {}));
diff --git a/tests/baselines/reference/project/prologueEmit/amd/out.js b/tests/baselines/reference/project/prologueEmit/amd/out.js
index 42313b7ce64ea..6a07c9a92ca1c 100644
--- a/tests/baselines/reference/project/prologueEmit/amd/out.js
+++ b/tests/baselines/reference/project/prologueEmit/amd/out.js
@@ -13,7 +13,7 @@ var m;
         function base() {
         }
         return base;
-    })();
+    }());
     m.base = base;
     var child = (function (_super) {
         __extends(child, _super);
@@ -21,6 +21,6 @@ var m;
             _super.apply(this, arguments);
         }
         return child;
-    })(base);
+    }(base));
     m.child = child;
 })(m || (m = {}));
diff --git a/tests/baselines/reference/project/prologueEmit/node/out.js b/tests/baselines/reference/project/prologueEmit/node/out.js
index 42313b7ce64ea..6a07c9a92ca1c 100644
--- a/tests/baselines/reference/project/prologueEmit/node/out.js
+++ b/tests/baselines/reference/project/prologueEmit/node/out.js
@@ -13,7 +13,7 @@ var m;
         function base() {
         }
         return base;
-    })();
+    }());
     m.base = base;
     var child = (function (_super) {
         __extends(child, _super);
@@ -21,6 +21,6 @@ var m;
             _super.apply(this, arguments);
         }
         return child;
-    })(base);
+    }(base));
     m.child = child;
 })(m || (m = {}));
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js
index 115b5fff25f17..5b3941738db13 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/li'b/class'A.js
@@ -5,6 +5,6 @@ var test;
         }
         ClassA.prototype.method = function () { };
         return ClassA;
-    })();
+    }());
     test.ClassA = ClassA;
 })(test || (test = {}));
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js
index 115b5fff25f17..5b3941738db13 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/li'b/class'A.js
@@ -5,6 +5,6 @@ var test;
         }
         ClassA.prototype.method = function () { };
         return ClassA;
-    })();
+    }());
     test.ClassA = ClassA;
 })(test || (test = {}));
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js
index ae9742b492f47..080f95401b3e6 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js
@@ -4,4 +4,4 @@ var bar = (function () {
     function bar() {
     }
     return bar;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js
index ae9742b492f47..080f95401b3e6 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js
@@ -4,4 +4,4 @@ var bar = (function () {
     function bar() {
     }
     return bar;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js
index ae9742b492f47..080f95401b3e6 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/bar/bar.js
@@ -4,4 +4,4 @@ var bar = (function () {
     function bar() {
     }
     return bar;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js
index ae9742b492f47..080f95401b3e6 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/bar/bar.js
@@ -4,4 +4,4 @@ var bar = (function () {
     function bar() {
     }
     return bar;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js
index 20440d5c62b29..4a01207bfce77 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/foo.js
@@ -3,4 +3,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js
index 20440d5c62b29..4a01207bfce77 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/foo.js
@@ -3,4 +3,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js
index ae9742b492f47..080f95401b3e6 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js
@@ -4,4 +4,4 @@ var bar = (function () {
     function bar() {
     }
     return bar;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js
index ae9742b492f47..080f95401b3e6 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js
@@ -4,4 +4,4 @@ var bar = (function () {
     function bar() {
     }
     return bar;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js
index c82f04ec5155a..1d436a9e57bcb 100644
--- a/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js
+++ b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/test.js
@@ -2,4 +2,4 @@ var test = (function () {
     function test() {
     }
     return test;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js
index c82f04ec5155a..1d436a9e57bcb 100644
--- a/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js
+++ b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/test.js
@@ -2,4 +2,4 @@ var test = (function () {
     function test() {
     }
     return test;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js
index c82f04ec5155a..1d436a9e57bcb 100644
--- a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js
+++ b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/test.js
@@ -2,4 +2,4 @@ var test = (function () {
     function test() {
     }
     return test;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js
index c82f04ec5155a..1d436a9e57bcb 100644
--- a/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js
+++ b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/test.js
@@ -2,4 +2,4 @@ var test = (function () {
     function test() {
     }
     return test;
-})();
+}());
diff --git a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js
index 8840c2117cfd2..f5e6c21e37c95 100644
--- a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js
+++ b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/FolderC/fileC.js
@@ -2,5 +2,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 //# sourceMappingURL=fileC.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt
index 4ef619780a6a9..73cf17e69f834 100644
--- a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.sourcemap.txt
@@ -38,7 +38,7 @@ sourceFile:../../../../FolderA/FolderB/FolderC/fileC.ts
 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -104,7 +104,7 @@ sourceFile:../../../FolderA/FolderB/fileB.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js
index 8840c2117cfd2..f5e6c21e37c95 100644
--- a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js
+++ b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/FolderC/fileC.js
@@ -2,5 +2,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 //# sourceMappingURL=fileC.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt
index 4ef619780a6a9..73cf17e69f834 100644
--- a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.sourcemap.txt
@@ -38,7 +38,7 @@ sourceFile:../../../../FolderA/FolderB/FolderC/fileC.ts
 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -104,7 +104,7 @@ sourceFile:../../../FolderA/FolderB/fileB.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.js
index 325ac60ee3288..87b76821b97ab 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.js
+++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/FolderC/fileC.js
@@ -2,4 +2,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.js
index 325ac60ee3288..87b76821b97ab 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.js
+++ b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/FolderC/fileC.js
@@ -2,4 +2,4 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js
index 8840c2117cfd2..f5e6c21e37c95 100644
--- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js
+++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/FolderC/fileC.js
@@ -2,5 +2,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 //# sourceMappingURL=fileC.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt
index f7312546b9c1a..633462db8298f 100644
--- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt
+++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.sourcemap.txt
@@ -38,7 +38,7 @@ sourceFile:FolderB/FolderC/fileC.ts
 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -104,7 +104,7 @@ sourceFile:FolderB/fileB.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js
index 8840c2117cfd2..f5e6c21e37c95 100644
--- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js
+++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/FolderC/fileC.js
@@ -2,5 +2,5 @@ var C = (function () {
     function C() {
     }
     return C;
-})();
+}());
 //# sourceMappingURL=fileC.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt
index f7312546b9c1a..633462db8298f 100644
--- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt
+++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.sourcemap.txt
@@ -38,7 +38,7 @@ sourceFile:FolderB/FolderC/fileC.ts
 1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 2 >Emitted(4, 13) Source(2, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -104,7 +104,7 @@ sourceFile:FolderB/fileB.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 13) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
index 2e9af21f9334a..bbf106066ce6a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
index a0197125a2136..2f8982c734b65 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 3e718952d1335..4850ffcc02c59 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index c904a43bde796..bc0e71c54a8ad 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index a480aa83e80bf..25cfe0fccb5fa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index fdc46e9a0546d..f56fd16938c1a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
index 5af28cf8560c1..5d63d624329e6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 841774dd5d8e8..b8f92c4674fbf 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 1ebe03468c72e..de21b030c355c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index f906a7ec6b488..7bf07c6a51492 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
index 1750a5975aec0..da6a20151434f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 4cd16335c50f5..933fb217fd2e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
index dbd142633aa89..4c90a092c7222 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
index f7e814da92948..ee780cef09b08 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index f028d952086b7..4a874b3ffdea3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index fef086063a4ad..fe6d3b5b4ccb8 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 5db4d6336f15c..37064fb583b38 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 116d03e99d1f3..b0755e21b7e61 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -227,7 +227,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2)
 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
index ed667e35c034d..051c81cae4080 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
index d48dcb61c683d..91b3bdf8910e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 937ad4f4647cf..aabfdcda9585f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index ef8b955f22f8e..8fd46afab661f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index cc73ea698fe63..d650b20ae5ffa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index f4237f8bb9fc4..eae02f5f5c0b2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
index f4f5f57241959..8dc074fd8b7bb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
index c71f3ce344a6b..31c1b28d08145 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 61718dfae16d7..72c00cd5f7a80 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index d267fc18a6bb1..235470a3907b4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 93a25f7ef19cc..f55492f4b4988 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 3691823f0761a..4a0e300da4763 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
index 43858f6ab7a2c..837d9525df0f9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
index 43858f6ab7a2c..837d9525df0f9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index 6de3c355d6f18..b09f90daa8fdc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index 6de3c355d6f18..b09f90daa8fdc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js
index e6b143a110ad0..ad96cca3d7952 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
index bc639f73abf91..dcbb570728b93 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js
index e6b143a110ad0..ad96cca3d7952 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
index bc639f73abf91..dcbb570728b93 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
index 0062e88d20e43..49736d31a0f98 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
index 0062e88d20e43..49736d31a0f98 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 98cd3b2fce21a..1cef37db0ad4f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 98cd3b2fce21a..1cef37db0ad4f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js
index 10bcbf92a21ca..481c10d1a06ad 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
index ff2cacede465f..c9e8934ba271a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js
index 10bcbf92a21ca..481c10d1a06ad 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
index ff2cacede465f..c9e8934ba271a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
index 125a4421ad971..5df64d65dda86 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
index 125a4421ad971..5df64d65dda86 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
index 9a26f02b8a576..fb45c5ce2a5f1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
index 9a26f02b8a576..fb45c5ce2a5f1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
index e5ab088d09287..70172cbcfcf0b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
index e5ab088d09287..70172cbcfcf0b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
index 2ef04f2b3f77d..04278e4304fab 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
index 2ef04f2b3f77d..04278e4304fab 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index d197965afca05..eb461863ded72 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index d197965afca05..eb461863ded72 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js
index c82993389bf99..a456603674661 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
index 6b213c2a75c32..5e0522712edde 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js
index c82993389bf99..a456603674661 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
index 6b213c2a75c32..5e0522712edde 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
index 54e361169bfd8..489e78d9fde8c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
index 122955308fc37..baef829e57bd1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index babb39e3518cc..81ab0390e62d7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index f8dac699dd3cf..2c1bc766f13bf 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index a480aa83e80bf..25cfe0fccb5fa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 670b7ba5f2bde..b38b33e3161d7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
index 5af28cf8560c1..5d63d624329e6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
index a4e47c43e8e5b..44b5904f08517 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 1ebe03468c72e..de21b030c355c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 8ec79895fef1e..0236ff46b03b2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
index 1750a5975aec0..da6a20151434f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index b424fde902b88..31f4457f5650b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
index 496f1849d69d4..a82b4bfaabed2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
index 6d4fcd7bf89a7..c110e9cbd87cb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index dc6fc0fda03e1..27786349283c0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 992c66e53ae0d..f21172cd798b0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 5db4d6336f15c..37064fb583b38 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 14557880a9602..6e350e166a9a3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -227,7 +227,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2)
 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
index 0f93a19bb7483..adef47fb19e35 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
index e208286902234..53d5f7aae8445 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index aa1b771c0bbf4..404c165ed4fa5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 84a1e0175f53b..419535bbff4e1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index cc73ea698fe63..d650b20ae5ffa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 66f462e7c9f3c..8c581023df283 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
index 2030173b30db0..9e9e1aad878f4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
index 5e251d7c7e870..8700999ae53d2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 3a62229b645a7..196de117349d0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 552fa69288c24..8913576d74541 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 93a25f7ef19cc..f55492f4b4988 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 88ab2d261548b..e1c9ad562b4cd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
index 1e7409b877877..445dc0b3d7bc7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
index 1e7409b877877..445dc0b3d7bc7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index f22687619bc07..4f66a91c56384 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
index f22687619bc07..4f66a91c56384 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js
index e6b143a110ad0..ad96cca3d7952 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
index 53d479879d67c..95b3a8d15b12f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js
index e6b143a110ad0..ad96cca3d7952 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
index 53d479879d67c..95b3a8d15b12f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
index 02199705e318d..3257fb566ef35 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
index 02199705e318d..3257fb566ef35 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 43993182320e0..bede164b9dc92 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
index 43993182320e0..bede164b9dc92 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js
index 10bcbf92a21ca..481c10d1a06ad 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
index c797be4d43260..84caf2a520973 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js
index 10bcbf92a21ca..481c10d1a06ad 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
index c797be4d43260..84caf2a520973 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt
index e125816f9a18e..e08628e78a517 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt
index e125816f9a18e..e08628e78a517 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
index 3c8bc78f8f3cc..ea92fb80cf536 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
index 3c8bc78f8f3cc..ea92fb80cf536 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
index 6d92e64eb643f..a61409263fc64 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
index 6d92e64eb643f..a61409263fc64 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
index 64d3f901d6d29..a986dda9056bc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
index 64d3f901d6d29..a986dda9056bc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index e9073db7f8e6c..e90f9f1452180 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
index e9073db7f8e6c..e90f9f1452180 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js
index c82993389bf99..a456603674661 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
index e66acb3fe680b..3ef8bd4d658f1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js
index c82993389bf99..a456603674661 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
index e66acb3fe680b..3ef8bd4d658f1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
index bc878affc7d68..cffb2cc939754 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
index f383541378f7c..d13bb52d1528d 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 534a9499a68e9..787127afb9c2b 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:../../../ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 56f5ff25cc336..f4599748e7705 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:../../../ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index a480aa83e80bf..25cfe0fccb5fa 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
index fbb97b14e902e..c8992c0f9393e 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:../ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:../test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js
index 5af28cf8560c1..5d63d624329e6 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
index 08c87a22d2371..3cdd70b740456 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:../test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 1ebe03468c72e..de21b030c355c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 6e2448fdb3e47..986e49e04c538 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:../ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:../test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
index 1750a5975aec0..da6a20151434f 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 67bff3854348a..76d937730eb30 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:../test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt
index 1939a9428a66b..9547f1b0342a2 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt
index fe3c83ed28396..943ec822c5ba9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index fac0536ad7dcf..36d7531c89588 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../../../ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:../../../test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index dcb25b433948d..6e680ecfa65fd 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../../../ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:../../../../outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:../../../test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 5db4d6336f15c..37064fb583b38 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 6a48a2b7d8d61..5b31e410aaf4d 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -227,7 +227,7 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts
 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:../test.ts
 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2)
 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt
index bba2edd10017f..56b251ecb6292 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt
index e5eb42814b0a5..412e5a18c8ea0 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index ff95cc13340e6..beebbe164544c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index a98cd950b0fbd..8afcfe6117a66 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
index cc73ea698fe63..d650b20ae5ffa 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
index a5c116d00e4ca..2d14a8364a927 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:../test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt
index 8489469d29a0b..3a561ae023a59 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt
index dcbc990a0846a..4565660454d5e 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index ed6c818fda582..4b55b597fc629 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 88e2ff35ec180..d0115edec0caf 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:../../test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 93a25f7ef19cc..f55492f4b4988 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
index b7c6dfd3fdd94..8ed04c04575e2 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:../test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt
index fae25202ebf25..10eebf86ef00d 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt
index fae25202ebf25..10eebf86ef00d 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
index b638e890cfce2..d7d0942b868eb 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:../../../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
index b638e890cfce2..d7d0942b868eb 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:../../../../outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:../../../test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js
index e6b143a110ad0..ad96cca3d7952 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
index efde82f881cd9..c4c69a0ea783e 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:../test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js
index e6b143a110ad0..ad96cca3d7952 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
index efde82f881cd9..c4c69a0ea783e 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:../../outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:../test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt
index 2eb83abfe6a56..1a11ea635c6b9 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt
index 2eb83abfe6a56..1a11ea635c6b9 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
index afe348176d3c5..66616a905f249 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
index afe348176d3c5..66616a905f249 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js
index 10bcbf92a21ca..481c10d1a06ad 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
index 246480ea6fba5..d61cb327bd49c 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js
index 10bcbf92a21ca..481c10d1a06ad 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
index 246480ea6fba5..d61cb327bd49c 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt
index 662bee468cda5..a46d487d93204 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt
index 662bee468cda5..a46d487d93204 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt
index 2b86d9f68227a..e408c9f1014d5 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt
index 2b86d9f68227a..e408c9f1014d5 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt
index 8dcf4e9b92851..abee977af4c63 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt
index 8dcf4e9b92851..abee977af4c63 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt
index e9fd62ee40df4..13e2e393c73af 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt
index e9fd62ee40df4..13e2e393c73af 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
index fd9ac18f50808..661399a1d42aa 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
index fd9ac18f50808..661399a1d42aa 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../../../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:../../test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js
index c82993389bf99..a456603674661 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
index 09d4554b31828..4aec10765d439 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js
index c82993389bf99..a456603674661 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
index 09d4554b31828..4aec10765d439 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:../ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:../test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
index c07300abf9132..7c7845dc4d792 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
index 072b66be99802..dacb09a48ca85 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index 51667d9da4847..c5dc52b94a301 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -203,7 +203,7 @@ sourceFile:ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
index eceffcab6bc9b..21a6509ddd407 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -202,7 +202,7 @@ sourceFile:ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -395,7 +395,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index a480aa83e80bf..25cfe0fccb5fa 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index b0f81c9a15c7a..007af88a26a6a 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js
index 5af28cf8560c1..5d63d624329e6 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
index c4c07a7d1d0ad..507fc8438958c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 1ebe03468c72e..de21b030c355c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -30,7 +30,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 0f23121a493d7..22bd357048696 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -197,7 +197,7 @@ sourceFile:ref/m2.ts
 1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -384,7 +384,7 @@ sourceFile:test.ts
 1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
index 1750a5975aec0..da6a20151434f 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -15,7 +15,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
index 2d42454f204fe..1b656424d2ca5 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -217,7 +217,7 @@ sourceFile:test.ts
 1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
index 00f645f2eac17..a7a75d094b0c0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
index b2dad692820c3..657327684adbb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 19c0e53aa0ca7..a3aaf6869459d 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -233,7 +233,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -408,7 +408,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 296dcf75dc74f..5b61d42875b8e 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -231,7 +231,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -452,7 +452,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 5db4d6336f15c..37064fb583b38 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
@@ -35,7 +35,7 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index e4b0a3e749611..ee3c5a5ca71a6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:outputdir_module_multifolder/ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -227,7 +227,7 @@ sourceFile:outputdir_module_multifolder_ref/m2.ts
 1->Emitted(22, 9) Source(4, 1) + SourceIndex(1)
 2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -396,7 +396,7 @@ sourceFile:outputdir_module_multifolder/test.ts
 1->Emitted(37, 9) Source(6, 1) + SourceIndex(2)
 2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
index d5d3573d71ed6..ac92d511dce6f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
index 379d118fec08a..6ab1c1d631052 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 7df1b9ec85be7..c29900cfdc943 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index cd4d334d3e26f..f4c1f40d95bda 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index cc73ea698fe63..d650b20ae5ffa 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index 1288ae58ca5c3..adb1e2c76b306 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
index 94f188a5e3db5..cb3f179fd1b6e 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
index 6388349845474..5073fc7ce1c6f 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 25001d63d84ce..bb59c6fbd9099 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index aae97adf33ffc..6c57ae57e72fb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -234,7 +234,7 @@ sourceFile:test.ts
 1->Emitted(7, 9) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 18) Source(5, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3bc070839007f..121a089af2379 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -4,7 +4,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 exports.m1_c1 = m1_c1;
 exports.m1_instance1 = new m1_c1();
 function m1_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 556733c18c6ce..db57e7cba0cb1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -59,7 +59,7 @@ sourceFile:ref/m1.ts
 1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -255,7 +255,7 @@ sourceFile:test.ts
 1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 93a25f7ef19cc..f55492f4b4988 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -5,7 +5,7 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         function m1_c1() {
         }
         return m1_c1;
-    })();
+    }());
     exports.m1_c1 = m1_c1;
     exports.m1_instance1 = new m1_c1();
     function m1_f1() {
@@ -20,7 +20,7 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 72a52b8ab9782..edca6852f8472 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -60,7 +60,7 @@ sourceFile:ref/m1.ts
 1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
 2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
@@ -228,7 +228,7 @@ sourceFile:test.ts
 1->Emitted(22, 9) Source(5, 1) + SourceIndex(1)
 2 >Emitted(22, 18) Source(5, 2) + SourceIndex(1)
 ---
->>>    })();
+>>>    }());
 1 >^^^^
 2 >    ^
 3 >     
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
index fb198e5f490b9..97837265fad42 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
index fb198e5f490b9..97837265fad42 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index ff2fee631b4da..66f7557a512d1 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
index ff2fee631b4da..66f7557a512d1 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -204,7 +204,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -366,7 +366,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
 2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js
index e6b143a110ad0..ad96cca3d7952 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 16d11d70bbfdd..6d3d1d19d8e49 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js
index e6b143a110ad0..ad96cca3d7952 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -13,7 +13,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
@@ -25,7 +25,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
index 16d11d70bbfdd..6d3d1d19d8e49 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:outputdir_multifolder/ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -198,7 +198,7 @@ sourceFile:outputdir_multifolder_ref/m2.ts
 1->Emitted(15, 5) Source(4, 1) + SourceIndex(1)
 2 >Emitted(15, 17) Source(4, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -354,7 +354,7 @@ sourceFile:outputdir_multifolder/test.ts
 1->Emitted(27, 5) Source(6, 1) + SourceIndex(2)
 2 >Emitted(27, 14) Source(6, 2) + SourceIndex(2)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt
index bd47f942319a8..8613693d6fd25 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt
index bd47f942319a8..8613693d6fd25 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index 9ae5029e13b8e..6b974c689f531 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
index 9ae5029e13b8e..6b974c689f531 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js
index 10bcbf92a21ca..481c10d1a06ad 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
index 5c2960857741b..1b93109c406ad 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js
index 10bcbf92a21ca..481c10d1a06ad 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
index 5c2960857741b..1b93109c406ad 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt
index 640e894b53c06..4c207cb647be6 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt
index 640e894b53c06..4c207cb647be6 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
index 8a280e118e5c1..04204fceadc41 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
index 8a280e118e5c1..04204fceadc41 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
index cb0dcfb8a0ccc..2f5fa2e9cbd5a 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js
index 335d79c01c6d3..e5a1c12a7323d 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
index cb0dcfb8a0ccc..2f5fa2e9cbd5a 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:test.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 14) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
index 2b19f844ec02a..2e2cd5bb0c929 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
index 2b19f844ec02a..2e2cd5bb0c929 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index f607f1f54384a..4ca0340ebfdf8 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index f6b169662c98a..b7283f7fd8830 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
index f607f1f54384a..4ca0340ebfdf8 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -213,7 +213,7 @@ sourceFile:test.ts
 1->Emitted(6, 5) Source(5, 1) + SourceIndex(0)
 2 >Emitted(6, 14) Source(5, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js
index c82993389bf99..a456603674661 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index 30aa681bfd206..14787fa857678 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js
index c82993389bf99..a456603674661 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/bin/test.js
@@ -3,7 +3,7 @@ var m1_c1 = (function () {
     function m1_c1() {
     }
     return m1_c1;
-})();
+}());
 var m1_instance1 = new m1_c1();
 function m1_f1() {
     return m1_instance1;
@@ -14,7 +14,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
index 30aa681bfd206..14787fa857678 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.sourcemap.txt
@@ -61,7 +61,7 @@ sourceFile:ref/m1.ts
 1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
@@ -207,7 +207,7 @@ sourceFile:test.ts
 1->Emitted(16, 5) Source(5, 1) + SourceIndex(1)
 2 >Emitted(16, 14) Source(5, 2) + SourceIndex(1)
 ---
->>>})();
+>>>}());
 1 >
 2 >^
 3 > 
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
index 63344d14b5464..a40f7b2f9cdb5 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
@@ -13,6 +13,6 @@ define(["require", "exports"], function (require, exports) {
             var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
         };
         return RM;
-    })();
+    }());
     exports.RM = RM;
 });
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
index b238334b7be59..c537ef5435289 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
@@ -12,5 +12,5 @@ var RM = (function () {
         var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
     };
     return RM;
-})();
+}());
 exports.RM = RM;

From e4c5676f2e812b0d58ab2e5bd0962ea1f7e649af Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 8 Dec 2015 17:54:33 -0800
Subject: [PATCH 5/7] Added test for immediately invoked class expression.

---
 .../conformance/classes/classExpressions/classExpression5.ts | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 tests/cases/conformance/classes/classExpressions/classExpression5.ts

diff --git a/tests/cases/conformance/classes/classExpressions/classExpression5.ts b/tests/cases/conformance/classes/classExpressions/classExpression5.ts
new file mode 100644
index 0000000000000..be2483ade4d58
--- /dev/null
+++ b/tests/cases/conformance/classes/classExpressions/classExpression5.ts
@@ -0,0 +1,5 @@
+new class {
+    hi() {
+        return "Hi!";
+    }
+}().hi();
\ No newline at end of file

From 222cd8e5fc0f54689cc456fbc806e2d5a46387d7 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 8 Dec 2015 17:57:41 -0800
Subject: [PATCH 6/7] Accepted baselines.

---
 tests/baselines/reference/classExpression5.js    | 16 ++++++++++++++++
 .../baselines/reference/classExpression5.symbols | 12 ++++++++++++
 tests/baselines/reference/classExpression5.types | 16 ++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 tests/baselines/reference/classExpression5.js
 create mode 100644 tests/baselines/reference/classExpression5.symbols
 create mode 100644 tests/baselines/reference/classExpression5.types

diff --git a/tests/baselines/reference/classExpression5.js b/tests/baselines/reference/classExpression5.js
new file mode 100644
index 0000000000000..fae615d3a553c
--- /dev/null
+++ b/tests/baselines/reference/classExpression5.js
@@ -0,0 +1,16 @@
+//// [classExpression5.ts]
+new class {
+    hi() {
+        return "Hi!";
+    }
+}().hi();
+
+//// [classExpression5.js]
+new (function () {
+    function class_1() {
+    }
+    class_1.prototype.hi = function () {
+        return "Hi!";
+    };
+    return class_1;
+}())().hi();
diff --git a/tests/baselines/reference/classExpression5.symbols b/tests/baselines/reference/classExpression5.symbols
new file mode 100644
index 0000000000000..17899f51ea475
--- /dev/null
+++ b/tests/baselines/reference/classExpression5.symbols
@@ -0,0 +1,12 @@
+=== tests/cases/conformance/classes/classExpressions/classExpression5.ts ===
+new class {
+>new class {    hi() {        return "Hi!";    }}().hi : Symbol((Anonymous class).hi, Decl(classExpression5.ts, 0, 11))
+
+    hi() {
+>hi : Symbol((Anonymous class).hi, Decl(classExpression5.ts, 0, 11))
+
+        return "Hi!";
+    }
+}().hi();
+>hi : Symbol((Anonymous class).hi, Decl(classExpression5.ts, 0, 11))
+
diff --git a/tests/baselines/reference/classExpression5.types b/tests/baselines/reference/classExpression5.types
new file mode 100644
index 0000000000000..25c4b66b8f331
--- /dev/null
+++ b/tests/baselines/reference/classExpression5.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/classes/classExpressions/classExpression5.ts ===
+new class {
+>new class {    hi() {        return "Hi!";    }}().hi() : string
+>new class {    hi() {        return "Hi!";    }}().hi : () => string
+>new class {    hi() {        return "Hi!";    }}() : (Anonymous class)
+>class {    hi() {        return "Hi!";    }} : typeof (Anonymous class)
+
+    hi() {
+>hi : () => string
+
+        return "Hi!";
+>"Hi!" : string
+    }
+}().hi();
+>hi : () => string
+

From 025210058b58b21986dca5b5822d4a959b39d782 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 8 Dec 2015 18:13:51 -0800
Subject: [PATCH 7/7] Accepted project baselines over and over until I hit a
 fixed point where everything passes.

---
 .../mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js     | 2 +-
 .../mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js       | 2 +-
 .../mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js    | 2 +-
 .../mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/ref/m2.js                                 | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/ref/m2.js                                | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../amd/diskFile1.js                                            | 2 +-
 .../mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js    | 2 +-
 .../node/diskFile1.js                                           | 2 +-
 .../mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js    | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder/test.js     | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 2 +-
 .../project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js | 2 +-
 .../mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js        | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js      | 2 +-
 .../mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js     | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js     | 2 +-
 .../project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js  | 2 +-
 .../mapRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js    | 2 +-
 .../project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js | 2 +-
 .../amd/outdir/simple/outputdir_multifolder/test.js             | 2 +-
 .../amd/outdir/simple/outputdir_multifolder_ref/m2.js           | 2 +-
 .../node/outdir/simple/outputdir_multifolder/test.js            | 2 +-
 .../node/outdir/simple/outputdir_multifolder_ref/m2.js          | 2 +-
 .../project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js       | 2 +-
 .../project/mapRootAbsolutePathSimpleNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js    | 2 +-
 .../project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js     | 2 +-
 .../mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js       | 2 +-
 .../mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js    | 2 +-
 .../mapRootRelativePathMixedSubfolderNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/ref/m2.js                                 | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/ref/m2.js                                | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../amd/diskFile1.js                                            | 2 +-
 .../mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js    | 2 +-
 .../node/diskFile1.js                                           | 2 +-
 .../mapRootRelativePathModuleMultifolderNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js    | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder/test.js     | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 2 +-
 .../project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js | 2 +-
 .../mapRootRelativePathModuleSimpleNoOutdir/node/test.js        | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js      | 2 +-
 .../mapRootRelativePathModuleSubfolderNoOutdir/node/test.js     | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../mapRootRelativePathMultifolderNoOutdir/amd/diskFile1.js     | 2 +-
 .../project/mapRootRelativePathMultifolderNoOutdir/amd/test.js  | 2 +-
 .../mapRootRelativePathMultifolderNoOutdir/node/diskFile1.js    | 2 +-
 .../project/mapRootRelativePathMultifolderNoOutdir/node/test.js | 2 +-
 .../amd/outdir/simple/outputdir_multifolder/test.js             | 2 +-
 .../amd/outdir/simple/outputdir_multifolder_ref/m2.js           | 2 +-
 .../node/outdir/simple/outputdir_multifolder/test.js            | 2 +-
 .../node/outdir/simple/outputdir_multifolder_ref/m2.js          | 2 +-
 .../project/mapRootRelativePathSimpleNoOutdir/amd/test.js       | 2 +-
 .../project/mapRootRelativePathSimpleNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/mapRootRelativePathSubfolderNoOutdir/amd/test.js    | 2 +-
 .../project/mapRootRelativePathSubfolderNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js      | 2 +-
 .../project/maprootUrlMixedSubfolderNoOutdir/amd/test.js        | 2 +-
 .../project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js     | 2 +-
 .../project/maprootUrlMixedSubfolderNoOutdir/node/test.js       | 2 +-
 .../amd/outdir/simple/ref/m2.js                                 | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/ref/m2.js                                | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js        | 2 +-
 .../project/maprootUrlModuleMultifolderNoOutdir/amd/test.js     | 2 +-
 .../maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js       | 2 +-
 .../project/maprootUrlModuleMultifolderNoOutdir/node/test.js    | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js    | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder/test.js     | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 2 +-
 .../project/maprootUrlModuleSimpleNoOutdir/amd/test.js          | 2 +-
 .../project/maprootUrlModuleSimpleNoOutdir/node/test.js         | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/maprootUrlModuleSubfolderNoOutdir/amd/test.js       | 2 +-
 .../project/maprootUrlModuleSubfolderNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/maprootUrlMultifolderNoOutdir/amd/diskFile1.js      | 2 +-
 .../reference/project/maprootUrlMultifolderNoOutdir/amd/test.js | 2 +-
 .../project/maprootUrlMultifolderNoOutdir/node/diskFile1.js     | 2 +-
 .../project/maprootUrlMultifolderNoOutdir/node/test.js          | 2 +-
 .../amd/outdir/simple/outputdir_multifolder/test.js             | 2 +-
 .../amd/outdir/simple/outputdir_multifolder_ref/m2.js           | 2 +-
 .../node/outdir/simple/outputdir_multifolder/test.js            | 2 +-
 .../node/outdir/simple/outputdir_multifolder_ref/m2.js          | 2 +-
 .../reference/project/maprootUrlSimpleNoOutdir/amd/test.js      | 2 +-
 .../reference/project/maprootUrlSimpleNoOutdir/node/test.js     | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../reference/project/maprootUrlSubfolderNoOutdir/amd/test.js   | 2 +-
 .../reference/project/maprootUrlSubfolderNoOutdir/node/test.js  | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js | 2 +-
 .../maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js   | 2 +-
 .../node/ref/m2.js                                              | 2 +-
 .../maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js  | 2 +-
 .../amd/outdir/simple/ref/m2.js                                 | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/ref/m2.js                                | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../amd/diskFile1.js                                            | 2 +-
 .../amd/test.js                                                 | 2 +-
 .../node/diskFile1.js                                           | 2 +-
 .../node/test.js                                                | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js    | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder/test.js     | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 2 +-
 .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js     | 2 +-
 .../maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js    | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js  | 2 +-
 .../maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile1.js | 2 +-
 .../maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js      | 2 +-
 .../node/diskFile1.js                                           | 2 +-
 .../maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js     | 2 +-
 .../amd/outdir/simple/outputdir_multifolder/test.js             | 2 +-
 .../amd/outdir/simple/outputdir_multifolder_ref/m2.js           | 2 +-
 .../node/outdir/simple/outputdir_multifolder/test.js            | 2 +-
 .../node/outdir/simple/outputdir_multifolder_ref/m2.js          | 2 +-
 .../project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js   | 2 +-
 .../project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js  | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js        | 2 +-
 .../maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js       | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js   | 2 +-
 .../reference/project/outMixedSubfolderNoOutdir/amd/test.js     | 2 +-
 .../reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js  | 2 +-
 .../reference/project/outMixedSubfolderNoOutdir/node/test.js    | 2 +-
 .../amd/outdir/simple/ref/m2.js                                 | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/ref/m2.js                                | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/outModuleMultifolderNoOutdir/amd/diskFile0.js       | 2 +-
 .../reference/project/outModuleMultifolderNoOutdir/amd/test.js  | 2 +-
 .../project/outModuleMultifolderNoOutdir/node/diskFile0.js      | 2 +-
 .../reference/project/outModuleMultifolderNoOutdir/node/test.js | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js    | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder/test.js     | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 2 +-
 .../reference/project/outModuleSimpleNoOutdir/amd/test.js       | 2 +-
 .../reference/project/outModuleSimpleNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../reference/project/outModuleSubfolderNoOutdir/amd/test.js    | 2 +-
 .../reference/project/outModuleSubfolderNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../reference/project/outMultifolderNoOutdir/amd/diskFile0.js   | 2 +-
 .../reference/project/outMultifolderNoOutdir/amd/test.js        | 2 +-
 .../reference/project/outMultifolderNoOutdir/node/diskFile0.js  | 2 +-
 .../reference/project/outMultifolderNoOutdir/node/test.js       | 2 +-
 .../amd/outdir/simple/outputdir_multifolder/test.js             | 2 +-
 .../amd/outdir/simple/outputdir_multifolder_ref/m2.js           | 2 +-
 .../node/outdir/simple/outputdir_multifolder/test.js            | 2 +-
 .../node/outdir/simple/outputdir_multifolder_ref/m2.js          | 2 +-
 tests/baselines/reference/project/outSimpleNoOutdir/amd/test.js | 2 +-
 .../baselines/reference/project/outSimpleNoOutdir/node/test.js  | 2 +-
 .../outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js   | 2 +-
 .../outSimpleSpecifyOutputDirectory/node/outdir/simple/test.js  | 2 +-
 .../reference/project/outSubfolderNoOutdir/amd/test.js          | 2 +-
 .../reference/project/outSubfolderNoOutdir/node/test.js         | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/quotesInFileAndDirectoryNames/amd/m'ain.js          | 2 +-
 .../project/quotesInFileAndDirectoryNames/node/m'ain.js         | 2 +-
 .../project/referenceResolutionRelativePaths/amd/foo.js         | 2 +-
 .../project/referenceResolutionRelativePaths/node/foo.js        | 2 +-
 .../amd/src/ts/foo/foo.js                                       | 2 +-
 .../node/src/ts/foo/foo.js                                      | 2 +-
 .../referenceResolutionRelativePathsNoResolve/amd/diskFile0.js  | 2 +-
 .../referenceResolutionRelativePathsNoResolve/node/diskFile0.js | 2 +-
 .../amd/foo.js                                                  | 2 +-
 .../node/foo.js                                                 | 2 +-
 .../project/rootDirectory/amd/outdir/simple/FolderB/fileB.js    | 2 +-
 .../project/rootDirectory/node/outdir/simple/FolderB/fileB.js   | 2 +-
 .../project/rootDirectoryErrors/amd/outdir/simple/fileB.js      | 2 +-
 .../project/rootDirectoryErrors/node/outdir/simple/fileB.js     | 2 +-
 .../amd/outdir/simple/FolderB/fileB.js                          | 2 +-
 .../node/outdir/simple/FolderB/fileB.js                         | 2 +-
 .../sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js  | 2 +-
 .../sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js    | 2 +-
 .../sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js | 2 +-
 .../sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/ref/m2.js                                 | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/ref/m2.js                                | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../amd/diskFile1.js                                            | 2 +-
 .../sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js | 2 +-
 .../node/diskFile1.js                                           | 2 +-
 .../node/test.js                                                | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js    | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder/test.js     | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 2 +-
 .../sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js      | 2 +-
 .../sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js     | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js   | 2 +-
 .../sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js  | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js  | 2 +-
 .../sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js       | 2 +-
 .../sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js | 2 +-
 .../sourceRootAbsolutePathMultifolderNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_multifolder/test.js             | 2 +-
 .../amd/outdir/simple/outputdir_multifolder_ref/m2.js           | 2 +-
 .../node/outdir/simple/outputdir_multifolder/test.js            | 2 +-
 .../node/outdir/simple/outputdir_multifolder_ref/m2.js          | 2 +-
 .../project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js    | 2 +-
 .../project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js | 2 +-
 .../sourceRootAbsolutePathSubfolderNoOutdir/node/test.js        | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js  | 2 +-
 .../sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js    | 2 +-
 .../sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js | 2 +-
 .../sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/ref/m2.js                                 | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/ref/m2.js                                | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../amd/diskFile1.js                                            | 2 +-
 .../sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js | 2 +-
 .../node/diskFile1.js                                           | 2 +-
 .../node/test.js                                                | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js    | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder/test.js     | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 2 +-
 .../sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js      | 2 +-
 .../sourceRootRelativePathModuleSimpleNoOutdir/node/test.js     | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js   | 2 +-
 .../sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js  | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../sourceRootRelativePathMultifolderNoOutdir/amd/diskFile1.js  | 2 +-
 .../sourceRootRelativePathMultifolderNoOutdir/amd/test.js       | 2 +-
 .../sourceRootRelativePathMultifolderNoOutdir/node/diskFile1.js | 2 +-
 .../sourceRootRelativePathMultifolderNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_multifolder/test.js             | 2 +-
 .../amd/outdir/simple/outputdir_multifolder_ref/m2.js           | 2 +-
 .../node/outdir/simple/outputdir_multifolder/test.js            | 2 +-
 .../node/outdir/simple/outputdir_multifolder_ref/m2.js          | 2 +-
 .../project/sourceRootRelativePathSimpleNoOutdir/amd/test.js    | 2 +-
 .../project/sourceRootRelativePathSimpleNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js | 2 +-
 .../sourceRootRelativePathSubfolderNoOutdir/node/test.js        | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js       | 2 +-
 .../project/sourcemapMixedSubfolderNoOutdir/amd/test.js         | 2 +-
 .../project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js      | 2 +-
 .../project/sourcemapMixedSubfolderNoOutdir/node/test.js        | 2 +-
 .../amd/outdir/simple/ref/m2.js                                 | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/ref/m2.js                                | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js | 2 +-
 .../project/sourcemapModuleMultifolderNoOutdir/amd/test.js      | 2 +-
 .../sourcemapModuleMultifolderNoOutdir/node/diskFile1.js        | 2 +-
 .../project/sourcemapModuleMultifolderNoOutdir/node/test.js     | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js    | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder/test.js     | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 2 +-
 .../reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js | 2 +-
 .../project/sourcemapModuleSimpleNoOutdir/node/test.js          | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/sourcemapModuleSubfolderNoOutdir/amd/test.js        | 2 +-
 .../project/sourcemapModuleSubfolderNoOutdir/node/test.js       | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/sourcemapMultifolderNoOutdir/amd/diskFile1.js       | 2 +-
 .../reference/project/sourcemapMultifolderNoOutdir/amd/test.js  | 2 +-
 .../project/sourcemapMultifolderNoOutdir/node/diskFile1.js      | 2 +-
 .../reference/project/sourcemapMultifolderNoOutdir/node/test.js | 2 +-
 .../amd/outdir/simple/outputdir_multifolder/test.js             | 2 +-
 .../amd/outdir/simple/outputdir_multifolder_ref/m2.js           | 2 +-
 .../node/outdir/simple/outputdir_multifolder/test.js            | 2 +-
 .../node/outdir/simple/outputdir_multifolder_ref/m2.js          | 2 +-
 .../reference/project/sourcemapSimpleNoOutdir/amd/test.js       | 2 +-
 .../reference/project/sourcemapSimpleNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../reference/project/sourcemapSubfolderNoOutdir/amd/test.js    | 2 +-
 .../reference/project/sourcemapSubfolderNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js   | 2 +-
 .../project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js     | 2 +-
 .../project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js  | 2 +-
 .../project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js    | 2 +-
 .../amd/outdir/simple/ref/m2.js                                 | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/ref/m2.js                                | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js     | 2 +-
 .../project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js  | 2 +-
 .../sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js    | 2 +-
 .../project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder/test.js      | 2 +-
 .../amd/outdir/simple/outputdir_module_multifolder_ref/m2.js    | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder/test.js     | 2 +-
 .../node/outdir/simple/outputdir_module_multifolder_ref/m2.js   | 2 +-
 .../project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js       | 2 +-
 .../project/sourcerootUrlModuleSimpleNoOutdir/node/test.js      | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js    | 2 +-
 .../project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js   | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/sourcerootUrlMultifolderNoOutdir/amd/diskFile1.js   | 2 +-
 .../project/sourcerootUrlMultifolderNoOutdir/amd/test.js        | 2 +-
 .../project/sourcerootUrlMultifolderNoOutdir/node/diskFile1.js  | 2 +-
 .../project/sourcerootUrlMultifolderNoOutdir/node/test.js       | 2 +-
 .../amd/outdir/simple/outputdir_multifolder/test.js             | 2 +-
 .../amd/outdir/simple/outputdir_multifolder_ref/m2.js           | 2 +-
 .../node/outdir/simple/outputdir_multifolder/test.js            | 2 +-
 .../node/outdir/simple/outputdir_multifolder_ref/m2.js          | 2 +-
 .../reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js   | 2 +-
 .../reference/project/sourcerootUrlSimpleNoOutdir/node/test.js  | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 .../project/sourcerootUrlSubfolderNoOutdir/amd/test.js          | 2 +-
 .../project/sourcerootUrlSubfolderNoOutdir/node/test.js         | 2 +-
 .../amd/outdir/simple/test.js                                   | 2 +-
 .../node/outdir/simple/test.js                                  | 2 +-
 376 files changed, 376 insertions(+), 376 deletions(-)

diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index fa0eb43e98e72..2ccb7d6f77ac0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js
index c664292eca356..2e104772c57c6 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index 991554b2cb336..b991eda4382fe 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js
index c664292eca356..2e104772c57c6 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index fa0eb43e98e72..2ccb7d6f77ac0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index c664292eca356..2e104772c57c6 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 991554b2cb336..b991eda4382fe 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index c664292eca356..2e104772c57c6 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index b2d0711042a80..d77e78e375142 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index d046b77d327ea..550fa7b95646b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index bb70e1342a1cd..76a761b602d2f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index 99285ad2e58ba..033b046cfe0d3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index d046b77d327ea..550fa7b95646b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index b2d0711042a80..d77e78e375142 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 99285ad2e58ba..033b046cfe0d3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index bb70e1342a1cd..76a761b602d2f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index 44e408fb39b18..81972e29958d6 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index 3a438f0255bc5..5bc656a7470e8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 44e408fb39b18..81972e29958d6 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 3a438f0255bc5..5bc656a7470e8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index f1d1c605eb430..cc32d33f88f0f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index 884fc07b3414f..69051eba247e0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index f1d1c605eb430..cc32d33f88f0f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 884fc07b3414f..69051eba247e0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js
index 8dc7c506cd6dd..23caea4d958d0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js
index 4ea192ec827c5..a15b4c334cf5e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js
index 8dc7c506cd6dd..23caea4d958d0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js
index 4ea192ec827c5..a15b4c334cf5e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
index 4ea192ec827c5..a15b4c334cf5e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
index 8dc7c506cd6dd..23caea4d958d0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
index 4ea192ec827c5..a15b4c334cf5e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
index 8dc7c506cd6dd..23caea4d958d0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js
index 477ab9b9bd524..907727092db71 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js
index 477ab9b9bd524..907727092db71 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 477ab9b9bd524..907727092db71 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 477ab9b9bd524..907727092db71 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js
index 7661081c85c2c..2ca0fd71ddebb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js
index 7661081c85c2c..2ca0fd71ddebb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 7661081c85c2c..2ca0fd71ddebb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 7661081c85c2c..2ca0fd71ddebb 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 22446a6202151..d0a6c1f583fae 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js
index 15ea98ef7edde..f6f5af1aced7f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index 83c26797422c6..b5c226692a074 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js
index 15ea98ef7edde..f6f5af1aced7f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 8135743efbb29..961737d6acf96 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index ce180d55323bd..347c791053ce1 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index dd1d86b133613..d078a80e31c74 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index ce180d55323bd..347c791053ce1 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index efc54df85c4c7..bbbb972580d77 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index e368bc35b2415..b40eb0dad1266 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index d6279c6e1b899..338d724fe93c5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
index fbdb77f2d2598..2786dcd54f30b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 3431f8ce475a0..6c23883b7abe6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index f6f3df3a777f9..a654db8e08792 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 27d8b15a593d2..76f1ae7fa803d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 971843479a5ff..a98ecd6f1c361 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
index 8205a698b7255..f6ab0afdc941f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
index a5faaf288bb28..d96b6cae463a7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 0189f9ede6338..88661b25d1dca 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 9264af81d3163..2e487817c4e0e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index cc3fde39a754f..a9c2e2c54621a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
index d2c56e1b16904..291a3630b3ea4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 529760ec8956b..bd2c181d29e92 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 535ac2c9706df..c162eaa36711e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile1.js
index c257072707f7d..4e041c379d0ab 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js
index 3a5f36cd16386..5359f0203544a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile1.js
index c257072707f7d..4e041c379d0ab 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js
index 3a5f36cd16386..5359f0203544a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
index 4823d597b6b51..36efd82054071 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
index 500879e7bb932..5e8ad54c27b41 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
index 4823d597b6b51..36efd82054071 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
index 500879e7bb932..5e8ad54c27b41 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js
index 3eb5d7bae1cb6..c3a81b7d67d26 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js
index 3eb5d7bae1cb6..c3a81b7d67d26 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index ee8fc06b62f24..730a04c3d7faf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index ee8fc06b62f24..730a04c3d7faf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js
index cca8db1b548a4..6d7f75fbf9abe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js
index cca8db1b548a4..6d7f75fbf9abe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 3325bc2ccfb28..d48af1d07cc13 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 3325bc2ccfb28..d48af1d07cc13 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 2f22bba7566da..709115794658e 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js
index d346b13ac18dc..a7248649dc7db 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index e542958a41055..e4c76ba72e2b7 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js
index d346b13ac18dc..a7248649dc7db 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 2f22bba7566da..709115794658e 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index d346b13ac18dc..a7248649dc7db 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index e542958a41055..e4c76ba72e2b7 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index d346b13ac18dc..a7248649dc7db 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 3a0f016c568cf..1e006b165b9a0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
index 40f17b7a6cc64..149e213901a1c 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index 94c4edd028979..2e93a073415fc 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
index 866997ceee077..99135b7b2759a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 40f17b7a6cc64..149e213901a1c 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 3a0f016c568cf..1e006b165b9a0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 866997ceee077..99135b7b2759a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 94c4edd028979..2e93a073415fc 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
index e5120428e519c..c3300bc7998d5 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
index 2e158a0284fcf..29b6fee1d6645 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index e5120428e519c..c3300bc7998d5 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 2e158a0284fcf..29b6fee1d6645 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
index 9ff0c2c90ff00..5ec4a04355754 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
index 1a8413b660194..0b258a0b620f3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 9ff0c2c90ff00..5ec4a04355754 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 1a8413b660194..0b258a0b620f3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile1.js
index 8c28bf7d9abf3..d8a933fca96a5 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js
index ea17b21a53727..c41870d0f8fe7 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile1.js
index 8c28bf7d9abf3..d8a933fca96a5 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js
index ea17b21a53727..c41870d0f8fe7 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
index ea17b21a53727..c41870d0f8fe7 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
index 8c28bf7d9abf3..d8a933fca96a5 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
index ea17b21a53727..c41870d0f8fe7 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
index 8c28bf7d9abf3..d8a933fca96a5 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js
index 168ab13ecd883..300e7663c4710 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js
index 168ab13ecd883..300e7663c4710 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 168ab13ecd883..300e7663c4710 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 168ab13ecd883..300e7663c4710 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js
index 78b49c056c9a5..b268cd98e4147 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js
index 78b49c056c9a5..b268cd98e4147 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 78b49c056c9a5..b268cd98e4147 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 78b49c056c9a5..b268cd98e4147 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 2f22bba7566da..709115794658e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js
index d346b13ac18dc..a7248649dc7db 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index e542958a41055..e4c76ba72e2b7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js
index d346b13ac18dc..a7248649dc7db 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 2f22bba7566da..709115794658e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index d346b13ac18dc..a7248649dc7db 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index e542958a41055..e4c76ba72e2b7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index d346b13ac18dc..a7248649dc7db 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 3a0f016c568cf..1e006b165b9a0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index 40f17b7a6cc64..149e213901a1c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index 94c4edd028979..2e93a073415fc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 866997ceee077..99135b7b2759a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 40f17b7a6cc64..149e213901a1c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 3a0f016c568cf..1e006b165b9a0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 866997ceee077..99135b7b2759a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 94c4edd028979..2e93a073415fc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
index e5120428e519c..c3300bc7998d5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
index 2e158a0284fcf..29b6fee1d6645 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index e5120428e519c..c3300bc7998d5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 2e158a0284fcf..29b6fee1d6645 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index 9ff0c2c90ff00..5ec4a04355754 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
index 1a8413b660194..0b258a0b620f3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 9ff0c2c90ff00..5ec4a04355754 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 1a8413b660194..0b258a0b620f3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile1.js
index 8c28bf7d9abf3..d8a933fca96a5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js
index ea17b21a53727..c41870d0f8fe7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile1.js
index 8c28bf7d9abf3..d8a933fca96a5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js
index ea17b21a53727..c41870d0f8fe7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
index ea17b21a53727..c41870d0f8fe7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
index 8c28bf7d9abf3..d8a933fca96a5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
index ea17b21a53727..c41870d0f8fe7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
index 8c28bf7d9abf3..d8a933fca96a5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js
index 168ab13ecd883..300e7663c4710 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js
index 168ab13ecd883..300e7663c4710 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 168ab13ecd883..300e7663c4710 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 168ab13ecd883..300e7663c4710 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js
index 78b49c056c9a5..b268cd98e4147 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js
index 78b49c056c9a5..b268cd98e4147 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 78b49c056c9a5..b268cd98e4147 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 78b49c056c9a5..b268cd98e4147 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
index 67db806ee95c9..125abe99f0e53 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js
index 572002356018b..82a3d031fcee2 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
index 818f4c9dd06a5..9fdf5b0ad0fcb 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js
index 572002356018b..82a3d031fcee2 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 67db806ee95c9..125abe99f0e53 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 572002356018b..82a3d031fcee2 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 818f4c9dd06a5..9fdf5b0ad0fcb 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 572002356018b..82a3d031fcee2 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
index 67db806ee95c9..125abe99f0e53 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
index 02ee3e86a3a70..ddda2e19133d4 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
index 818f4c9dd06a5..9fdf5b0ad0fcb 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
index f06fba8195527..77e6fbe68c1b6 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 02ee3e86a3a70..ddda2e19133d4 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 67db806ee95c9..125abe99f0e53 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index f06fba8195527..77e6fbe68c1b6 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 818f4c9dd06a5..9fdf5b0ad0fcb 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
index bc5eaec25e0ab..cd107bb32f2aa 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
index 147125b61c102..912480b74ce98 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index bc5eaec25e0ab..cd107bb32f2aa 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 147125b61c102..912480b74ce98 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
index fca6f6bc91346..67c8fedf8980e 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
index e4389a9467b9e..0dea10818b9b2 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index fca6f6bc91346..67c8fedf8980e 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index e4389a9467b9e..0dea10818b9b2 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile0.js
index d9e010cbef7d8..f5e38ab560c8d 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile0.js
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/diskFile0.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.js
index 693aed6973417..4a38b6ddd4d6f 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile0.js
index d9e010cbef7d8..f5e38ab560c8d 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile0.js
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/diskFile0.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.js
index 693aed6973417..4a38b6ddd4d6f 100644
--- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
index 693aed6973417..4a38b6ddd4d6f 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
index d9e010cbef7d8..f5e38ab560c8d 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
index 693aed6973417..4a38b6ddd4d6f 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
index d9e010cbef7d8..f5e38ab560c8d 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.js
index 6b3e0bddbbb6b..eb02f7a013a6b 100644
--- a/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outSimpleNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outSimpleNoOutdir/node/test.js
index 6b3e0bddbbb6b..eb02f7a013a6b 100644
--- a/tests/baselines/reference/project/outSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outSimpleNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 6b3e0bddbbb6b..eb02f7a013a6b 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 6b3e0bddbbb6b..eb02f7a013a6b 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.js
index 38f1692117afe..d93a6707fdfe4 100644
--- a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.js
index 38f1692117afe..d93a6707fdfe4 100644
--- a/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outSubfolderNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 38f1692117afe..d93a6707fdfe4 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 38f1692117afe..d93a6707fdfe4 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
index bdf2edefcb01d..64a207a7cad2c 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
@@ -10,4 +10,4 @@ var ClassC = (function (_super) {
         _super.apply(this, arguments);
     }
     return ClassC;
-})(test.ClassA);
+}(test.ClassA));
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
index bdf2edefcb01d..64a207a7cad2c 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
@@ -10,4 +10,4 @@ var ClassC = (function (_super) {
         _super.apply(this, arguments);
     }
     return ClassC;
-})(test.ClassA);
+}(test.ClassA));
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js
index 20440d5c62b29..4a01207bfce77 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/foo.js
@@ -3,4 +3,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js
index 20440d5c62b29..4a01207bfce77 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/foo.js
@@ -3,4 +3,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js
index 20440d5c62b29..4a01207bfce77 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/foo/foo.js
@@ -3,4 +3,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js
index 20440d5c62b29..4a01207bfce77 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/foo/foo.js
@@ -3,4 +3,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js
index ae9742b492f47..080f95401b3e6 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/diskFile0.js
@@ -4,4 +4,4 @@ var bar = (function () {
     function bar() {
     }
     return bar;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js
index ae9742b492f47..080f95401b3e6 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/diskFile0.js
@@ -4,4 +4,4 @@ var bar = (function () {
     function bar() {
     }
     return bar;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js
index 20440d5c62b29..4a01207bfce77 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/foo.js
@@ -3,4 +3,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js
index 20440d5c62b29..4a01207bfce77 100644
--- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/foo.js
@@ -3,4 +3,4 @@ var foo = (function () {
     function foo() {
     }
     return foo;
-})();
+}());
diff --git a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js
index 84af55d2d89e1..aff1446877c83 100644
--- a/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js
+++ b/tests/baselines/reference/project/rootDirectory/amd/outdir/simple/FolderB/fileB.js
@@ -3,5 +3,5 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 //# sourceMappingURL=fileB.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js
index 84af55d2d89e1..aff1446877c83 100644
--- a/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js
+++ b/tests/baselines/reference/project/rootDirectory/node/outdir/simple/FolderB/fileB.js
@@ -3,5 +3,5 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 //# sourceMappingURL=fileB.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.js b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.js
index 99199ca1742b3..486a6bb87a5a2 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.js
+++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/outdir/simple/fileB.js
@@ -3,4 +3,4 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.js b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.js
index 99199ca1742b3..486a6bb87a5a2 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.js
+++ b/tests/baselines/reference/project/rootDirectoryErrors/node/outdir/simple/fileB.js
@@ -3,4 +3,4 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js
index 84af55d2d89e1..aff1446877c83 100644
--- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js
+++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/outdir/simple/FolderB/fileB.js
@@ -3,5 +3,5 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 //# sourceMappingURL=fileB.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js
index 84af55d2d89e1..aff1446877c83 100644
--- a/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js
+++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/outdir/simple/FolderB/fileB.js
@@ -3,5 +3,5 @@ var B = (function () {
     function B() {
     }
     return B;
-})();
+}());
 //# sourceMappingURL=fileB.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index bf3f6e482670a..efa0bc948ede0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index 67406a9e410d5..84731dff566a8 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index bf3f6e482670a..efa0bc948ede0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 67406a9e410d5..84731dff566a8 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index 4e5ad232cc3ab..c4b7f56d76afc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index bbc39c2543192..fea4b619aa26a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 4e5ad232cc3ab..c4b7f56d76afc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index bbc39c2543192..fea4b619aa26a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index 081c888ee0234..0ad51aeb02ec4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index bdc33590853f7..ebd5fdb3b3f27 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 081c888ee0234..0ad51aeb02ec4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bdc33590853f7..ebd5fdb3b3f27 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index bf3f6e482670a..efa0bc948ede0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 67406a9e410d5..84731dff566a8 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index bf3f6e482670a..efa0bc948ede0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 67406a9e410d5..84731dff566a8 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
index 4e5ad232cc3ab..c4b7f56d76afc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
index bbc39c2543192..fea4b619aa26a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 4e5ad232cc3ab..c4b7f56d76afc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index bbc39c2543192..fea4b619aa26a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index 081c888ee0234..0ad51aeb02ec4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
index bdc33590853f7..ebd5fdb3b3f27 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 081c888ee0234..0ad51aeb02ec4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bdc33590853f7..ebd5fdb3b3f27 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile1.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile1.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
index bf3f6e482670a..efa0bc948ede0 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
index 67406a9e410d5..84731dff566a8 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index bf3f6e482670a..efa0bc948ede0 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 67406a9e410d5..84731dff566a8 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
index 4e5ad232cc3ab..c4b7f56d76afc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
index bbc39c2543192..fea4b619aa26a 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 4e5ad232cc3ab..c4b7f56d76afc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index bbc39c2543192..fea4b619aa26a 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
index 081c888ee0234..0ad51aeb02ec4 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
index bdc33590853f7..ebd5fdb3b3f27 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 081c888ee0234..0ad51aeb02ec4 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bdc33590853f7..ebd5fdb3b3f27 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile1.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile1.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 8b8abfc1aedb1..78426750a82a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index bf3f6e482670a..efa0bc948ede0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 67406a9e410d5..84731dff566a8 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index bf3f6e482670a..efa0bc948ede0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index dd1c532b6dfbd..41f4a4e252191 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -5,7 +5,7 @@ define(["require", "exports"], function (require, exports) {
         function m2_c1() {
         }
         return m2_c1;
-    })();
+    }());
     exports.m2_c1 = m2_c1;
     exports.m2_instance1 = new m2_c1();
     function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 67406a9e410d5..84731dff566a8 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -6,7 +6,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1646fd608eaa3..eae1115846aec 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -4,7 +4,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 exports.m2_c1 = m2_c1;
 exports.m2_instance1 = new m2_c1();
 function m2_f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
index 4e5ad232cc3ab..c4b7f56d76afc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
index bbc39c2543192..fea4b619aa26a 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 4e5ad232cc3ab..c4b7f56d76afc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index bbc39c2543192..fea4b619aa26a 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index 081c888ee0234..0ad51aeb02ec4 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
index bdc33590853f7..ebd5fdb3b3f27 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 081c888ee0234..0ad51aeb02ec4 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -5,7 +5,7 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
         function c1() {
         }
         return c1;
-    })();
+    }());
     exports.c1 = c1;
     exports.instance1 = new c1();
     function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bdc33590853f7..ebd5fdb3b3f27 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 exports.c1 = c1;
 exports.instance1 = new c1();
 function f1() {
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile1.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile1.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/diskFile1.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
index 87d3f00699381..088a77f3f259c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder/test.js
@@ -5,7 +5,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
index 9f44db1fad51c..a1041b6d258ef 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_multifolder_ref/m2.js
@@ -3,7 +3,7 @@ var m2_c1 = (function () {
     function m2_c1() {
     }
     return m2_c1;
-})();
+}());
 var m2_instance1 = new m2_c1();
 function m2_f1() {
     return m2_instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 218d8fcf05dd7..679b65b57336e 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bdb90297aeacc..408b7e46f6182 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -4,7 +4,7 @@ var c1 = (function () {
     function c1() {
     }
     return c1;
-})();
+}());
 var instance1 = new c1();
 function f1() {
     return instance1;