From f85ab2a5c389bce62cd963f5668b037c6b6095cc Mon Sep 17 00:00:00 2001
From: Josh Goldberg <me@joshuakgoldberg.com>
Date: Tue, 17 Mar 2020 18:01:34 -0400
Subject: [PATCH] Undind unintentional whitespace changes

This reverts commit 26c7615f58e6807b818215f0b0bdc60328d1420f.
---
 src/compiler/transformers/es2015.ts           | 128 +--
 ...sClassHeritageListMemberTypeAnnotations.js |   3 +-
 ...accessibleTypeInTypeParameterConstraint.js |   3 +-
 .../reference/abstractClassInLocalScope.js    |   3 +-
 .../abstractClassInLocalScopeIsAbstract.js    |   3 +-
 tests/baselines/reference/abstractProperty.js |   3 +-
 .../abstractPropertyInConstructor.js          |   3 +-
 .../reference/abstractPropertyNegative.js     |   3 +-
 .../accessOverriddenBaseClassMember1.js       |   3 +-
 .../reference/accessorsOverrideProperty7.js   |   3 +-
 .../accessors_spec_section-4.5_inference.js   |   3 +-
 .../reference/aliasUsageInAccessorsOfClass.js |   3 +-
 .../baselines/reference/aliasUsageInArray.js  |   3 +-
 .../aliasUsageInFunctionExpression.js         |   3 +-
 .../reference/aliasUsageInGenericFunction.js  |   3 +-
 .../reference/aliasUsageInIndexerOfClass.js   |   3 +-
 .../reference/aliasUsageInObjectLiteral.js    |   3 +-
 .../reference/aliasUsageInOrExpression.js     |   3 +-
 ...aliasUsageInTypeArgumentOfExtendsClause.js |   6 +-
 .../reference/aliasUsageInVarAssignment.js    |   3 +-
 .../reference/ambiguousOverloadResolution.js  |   3 +-
 .../amdDeclarationEmitNoExtraDeclare.js       |   3 +-
 .../anonClassDeclarationEmitIsAnon.js         |   6 +-
 ...ClassDeclarationDoesntPrintWithReadonly.js |   3 +-
 .../reference/apparentTypeSubtyping.js        |   3 +-
 .../reference/apparentTypeSupertype.js        |   3 +-
 .../reference/arrayAssignmentTest1.js         |   3 +-
 .../reference/arrayAssignmentTest2.js         |   3 +-
 .../reference/arrayBestCommonTypes.js         |   3 +-
 .../reference/arrayLiteralTypeInference.js    |   3 +-
 tests/baselines/reference/arrayLiterals.js    |   3 +-
 .../arrayLiteralsWithRecursiveGenerics.js     |   3 +-
 ...rayOfSubtypeIsAssignableToReadonlyArray.js |   3 +-
 .../reference/arrowFunctionContexts.js        |   3 +-
 .../reference/assertionTypePredicates1.js     |   3 +-
 .../assignmentCompatWithCallSignatures3.js    |   3 +-
 .../assignmentCompatWithCallSignatures4.js    |   3 +-
 .../assignmentCompatWithCallSignatures5.js    |   3 +-
 .../assignmentCompatWithCallSignatures6.js    |   3 +-
 ...ssignmentCompatWithConstructSignatures3.js |   3 +-
 ...ssignmentCompatWithConstructSignatures4.js |   3 +-
 ...ssignmentCompatWithConstructSignatures5.js |   3 +-
 ...ssignmentCompatWithConstructSignatures6.js |   3 +-
 .../assignmentCompatWithNumericIndexer.js     |   3 +-
 .../assignmentCompatWithNumericIndexer3.js    |   3 +-
 .../assignmentCompatWithObjectMembers4.js     |   3 +-
 ...nmentCompatWithObjectMembersOptionality.js |   3 +-
 ...mentCompatWithObjectMembersOptionality2.js |   3 +-
 .../assignmentCompatWithStringIndexer.js      |   3 +-
 .../reference/assignmentLHSIsValue.js         |   3 +-
 .../reference/asyncImportedPromise_es5.js     |   3 +-
 tests/baselines/reference/autolift4.js        |   3 +-
 tests/baselines/reference/baseCheck.js        |   3 +-
 .../baseClassImprovedMismatchErrors.js        |   3 +-
 .../reference/baseConstraintOfDecorator.js    |   3 +-
 .../reference/baseExpressionTypeParameters.js |   3 +-
 .../reference/baseIndexSignatureResolution.js |   3 +-
 .../reference/baseTypeOrderChecking.js        |   3 +-
 .../baseTypeWrappingInstantiationChain.js     |   3 +-
 tests/baselines/reference/bases.js            |   3 +-
 .../bestCommonTypeOfConditionalExpressions.js |   3 +-
 ...bestCommonTypeOfConditionalExpressions2.js |   3 +-
 .../reference/bestCommonTypeOfTuple2.js       |   3 +-
 .../callChainWithSuper(target=es5).js         |   3 +-
 ...allSignatureAssignabilityInInheritance2.js |   3 +-
 ...allSignatureAssignabilityInInheritance3.js |   3 +-
 ...allSignatureAssignabilityInInheritance4.js |   3 +-
 ...allSignatureAssignabilityInInheritance5.js |   3 +-
 ...allSignatureAssignabilityInInheritance6.js |   3 +-
 tests/baselines/reference/callWithSpread.js   |   3 +-
 ...captureSuperPropertyAccessInSuperCall01.js |   3 +-
 .../reference/captureThisInSuperCall.js       |   3 +-
 tests/baselines/reference/castingTuple.js     |   3 +-
 .../baselines/reference/chainedAssignment3.js |   3 +-
 ...arameterConstrainedToOtherTypeParameter.js |   3 +-
 .../reference/checkForObjectTooStrict.js      |   3 +-
 .../checkJsxChildrenCanBeTupleType.js         |   3 +-
 .../reference/checkJsxChildrenProperty12.js   |   3 +-
 .../reference/checkJsxChildrenProperty13.js   |   3 +-
 .../reference/checkJsxChildrenProperty14.js   |   3 +-
 .../reference/checkJsxChildrenProperty3.js    |   3 +-
 .../reference/checkJsxChildrenProperty4.js    |   3 +-
 .../reference/checkJsxChildrenProperty5.js    |   3 +-
 .../reference/checkJsxChildrenProperty6.js    |   3 +-
 .../reference/checkJsxChildrenProperty7.js    |   3 +-
 .../reference/checkJsxChildrenProperty8.js    |   3 +-
 .../checkJsxIntersectionElementPropsType.js   |   3 +-
 .../checkJsxSubtleSkipContextSensitiveBug.js  |   3 +-
 .../checkSuperCallBeforeThisAccessing1.js     |   3 +-
 .../checkSuperCallBeforeThisAccessing2.js     |   3 +-
 .../checkSuperCallBeforeThisAccessing3.js     |   3 +-
 .../checkSuperCallBeforeThisAccessing4.js     |   3 +-
 .../checkSuperCallBeforeThisAccessing5.js     |   3 +-
 .../checkSuperCallBeforeThisAccessing6.js     |   3 +-
 .../checkSuperCallBeforeThisAccessing7.js     |   3 +-
 .../checkSuperCallBeforeThisAccessing8.js     |   3 +-
 ...ircularConstraintYieldsAppropriateError.js |   3 +-
 .../reference/circularImportAlias.js          |   3 +-
 .../circularTypeofWithFunctionModule.js       |   3 +-
 .../classAbstractConstructorAssignability.js  |   3 +-
 .../reference/classAbstractCrashedOnce.js     |   3 +-
 .../reference/classAbstractExtends.js         |   3 +-
 .../reference/classAbstractFactoryFunction.js |   3 +-
 .../reference/classAbstractGeneric.js         |   3 +-
 .../reference/classAbstractInAModule.js       |   3 +-
 .../reference/classAbstractInheritance.js     |   3 +-
 .../reference/classAbstractInstantiations1.js |   3 +-
 .../reference/classAbstractInstantiations2.js |   3 +-
 .../classAbstractOverrideWithAbstract.js      |   3 +-
 .../reference/classAbstractSuperCalls.js      |   3 +-
 .../classAbstractUsingAbstractMethod1.js      |   3 +-
 .../classAbstractUsingAbstractMethods2.js     |   3 +-
 .../classConstructorAccessibility2.js         |   3 +-
 .../classConstructorAccessibility4.js         |   3 +-
 .../classConstructorAccessibility5.js         |   3 +-
 ...classConstructorParametersAccessibility.js |   3 +-
 ...lassConstructorParametersAccessibility2.js |   3 +-
 ...lassConstructorParametersAccessibility3.js |   3 +-
 ...clarationMergedInModuleWithContinuation.js |   3 +-
 .../classDeclaredBeforeClassFactory.js        |   3 +-
 .../classDoesNotDependOnBaseTypes.js          |   3 +-
 tests/baselines/reference/classExpression2.js |   3 +-
 tests/baselines/reference/classExpression3.js |   3 +-
 .../classExpressionExtendingAbstractClass.js  |   3 +-
 ...lassExpressionInClassStaticDeclarations.js |   3 +-
 .../reference/classExtendingBuiltinType.js    |   3 +-
 .../reference/classExtendingClass.js          |   3 +-
 .../reference/classExtendingClassLikeType.js  |   3 +-
 .../reference/classExtendingNonConstructor.js |   3 +-
 .../baselines/reference/classExtendingNull.js |   3 +-
 .../reference/classExtendingPrimitive.js      |   3 +-
 .../reference/classExtendingPrimitive2.js     |   3 +-
 .../reference/classExtendingQualifiedName.js  |   3 +-
 .../reference/classExtendingQualifiedName2.js |   3 +-
 .../reference/classExtendsAcrossFiles.js      |   6 +-
 ...sMergedWithModuleNotReferingConstructor.js |   3 +-
 ...tendsClauseClassNotReferringConstructor.js |   3 +-
 .../reference/classExtendsEveryObjectType.js  |   3 +-
 .../reference/classExtendsEveryObjectType2.js |   3 +-
 .../reference/classExtendsInterface.js        |   3 +-
 .../classExtendsInterfaceInExpression.js      |   3 +-
 .../classExtendsInterfaceInModule.js          |   3 +-
 .../reference/classExtendsInterface_not.js    |   3 +-
 .../baselines/reference/classExtendsItself.js |   3 +-
 .../reference/classExtendsItselfIndirectly.js |   3 +-
 .../classExtendsItselfIndirectly2.js          |   3 +-
 .../classExtendsItselfIndirectly3.js          |  18 +-
 .../classExtendsMultipleBaseClasses.js        |   3 +-
 tests/baselines/reference/classExtendsNull.js |   3 +-
 ...classExtendsShadowedConstructorFunction.js |   3 +-
 .../classExtendsValidConstructorFunction.js   |   3 +-
 .../reference/classExtensionNameOutput.js     |   3 +-
 .../classHeritageWithTrailingSeparator.js     |   3 +-
 .../reference/classImplementsClass2.js        |   3 +-
 .../reference/classImplementsClass3.js        |   3 +-
 .../reference/classImplementsClass4.js        |   3 +-
 .../reference/classImplementsClass5.js        |   3 +-
 .../reference/classImplementsClass6.js        |   3 +-
 tests/baselines/reference/classIndexer3.js    |   3 +-
 tests/baselines/reference/classInheritence.js |   3 +-
 .../reference/classIsSubtypeOfBaseType.js     |   3 +-
 ...MergedWithInterfaceMultipleBasesNoError.js |   3 +-
 tests/baselines/reference/classOrder2.js      |   3 +-
 tests/baselines/reference/classOrderBug.js    |   3 +-
 .../reference/classSideInheritance1.js        |   3 +-
 .../reference/classSideInheritance2.js        |   3 +-
 .../reference/classSideInheritance3.js        |   3 +-
 tests/baselines/reference/classUpdateTests.js |   3 +-
 .../classUsedBeforeInitializedVariables.js    |   3 +-
 .../classWithBaseClassButNoConstructor.js     |   3 +-
 .../reference/classWithConstructors.js        |   3 +-
 .../reference/classWithProtectedProperty.js   |   3 +-
 .../reference/classWithStaticMembers.js       |   3 +-
 tests/baselines/reference/classdecl.js        |   3 +-
 .../reference/cloduleGenericOnSelfMember.js   |   3 +-
 .../reference/clodulesDerivedClasses.js       |   3 +-
 ...llisionSuperAndLocalFunctionInAccessors.js |   3 +-
 ...isionSuperAndLocalFunctionInConstructor.js |   3 +-
 .../collisionSuperAndLocalFunctionInMethod.js |   3 +-
 ...ollisionSuperAndLocalFunctionInProperty.js |   3 +-
 .../collisionSuperAndLocalVarInAccessors.js   |   3 +-
 .../collisionSuperAndLocalVarInConstructor.js |   3 +-
 .../collisionSuperAndLocalVarInMethod.js      |   3 +-
 .../collisionSuperAndLocalVarInProperty.js    |   3 +-
 .../collisionSuperAndNameResolution.js        |   3 +-
 .../reference/collisionSuperAndParameter.js   |   3 +-
 .../reference/collisionSuperAndParameter1.js  |   3 +-
 ...perAndPropertyNameAsConstuctorParameter.js |   3 +-
 ...xpressionAndLocalVarWithSuperExperssion.js |   3 +-
 .../reference/commentsInheritance.js          |   3 +-
 .../comparisonOperatorWithIdenticalObjects.js |   3 +-
 ...ithNoRelationshipObjectsOnCallSignature.js |   3 +-
 ...lationshipObjectsOnConstructorSignature.js |   3 +-
 ...thNoRelationshipObjectsOnIndexSignature.js |   3 +-
 ...nshipObjectsOnInstantiatedCallSignature.js |   3 +-
 ...jectsOnInstantiatedConstructorSignature.js |   3 +-
 ...peratorWithSubtypeObjectOnCallSignature.js |   3 +-
 ...WithSubtypeObjectOnConstructorSignature.js |   3 +-
 ...eratorWithSubtypeObjectOnIndexSignature.js |   3 +-
 ...ubtypeObjectOnInstantiatedCallSignature.js |   3 +-
 ...bjectOnInstantiatedConstructorSignature.js |   3 +-
 ...isonOperatorWithSubtypeObjectOnProperty.js |   3 +-
 .../reference/complexClassRelationships.js    |   3 +-
 ...catedGenericRecursiveBaseClassReference.js |   3 +-
 .../reference/compoundAssignmentLHSIsValue.js |   3 +-
 ...poundExponentiationAssignmentLHSIsValue.js |   3 +-
 .../reference/computedPropertyNames24_ES5.js  |   3 +-
 .../reference/computedPropertyNames25_ES5.js  |   3 +-
 .../reference/computedPropertyNames26_ES5.js  |   3 +-
 .../reference/computedPropertyNames27_ES5.js  |   3 +-
 .../reference/computedPropertyNames28_ES5.js  |   3 +-
 .../reference/computedPropertyNames30_ES5.js  |   3 +-
 .../reference/computedPropertyNames31_ES5.js  |   3 +-
 .../reference/computedPropertyNames43_ES5.js  |   3 +-
 .../reference/computedPropertyNames44_ES5.js  |   3 +-
 .../reference/computedPropertyNames45_ES5.js  |   3 +-
 .../conditionalOperatorWithIdenticalBCT.js    |   3 +-
 .../conditionalOperatorWithoutIdenticalBCT.js |   3 +-
 .../reference/constantOverloadFunction.js     |   3 +-
 .../constantOverloadFunctionNoSubtypeError.js |   3 +-
 ...nstraintCheckInGenericBaseTypeReference.js |   3 +-
 ...uctSignatureAssignabilityInInheritance2.js |   3 +-
 ...uctSignatureAssignabilityInInheritance3.js |   3 +-
 ...uctSignatureAssignabilityInInheritance4.js |   3 +-
 ...uctSignatureAssignabilityInInheritance5.js |   3 +-
 ...uctSignatureAssignabilityInInheritance6.js |   3 +-
 tests/baselines/reference/constructorArgs.js  |   3 +-
 ...uctorFunctionTypeIsAssignableToBaseType.js |   3 +-
 ...ctorFunctionTypeIsAssignableToBaseType2.js |   3 +-
 .../constructorHasPrototypeProperty.js        |   3 +-
 .../reference/constructorOverloads2.js        |   3 +-
 .../reference/constructorOverloads3.js        |   3 +-
 .../reference/constructorWithCapturedSuper.js |   3 +-
 ...constructorWithIncompleteTypeAnnotation.js |   3 +-
 .../contextualTypingArrayOfLambdas.js         |   3 +-
 ...contextualTypingOfConditionalExpression.js |   3 +-
 ...ontextualTypingOfConditionalExpression2.js |   3 +-
 .../controlFlowSuperPropertyAccess.js         |   3 +-
 ...urcePropertyIsRelatableToTargetProperty.js |   3 +-
 .../reference/declFileClassExtendsNull.js     |   3 +-
 .../declFileForFunctionTypeAsTypeParameter.js |   3 +-
 ...ileGenericClassWithGenericExtendedClass.js |   3 +-
 .../reference/declFileGenericType.js          |   3 +-
 .../reference/declFileGenericType2.js         |   3 +-
 ...lictingWithClassReferredByExtendsClause.js |   3 +-
 ...dsClauseThatHasItsContainerNameConflict.js |   3 +-
 .../declarationEmitExpressionInExtends.js     |   3 +-
 .../declarationEmitExpressionInExtends2.js    |   3 +-
 .../declarationEmitExpressionInExtends3.js    |   3 +-
 .../declarationEmitExpressionInExtends4.js    |   3 +-
 .../declarationEmitExpressionInExtends5.js    |   3 +-
 ...DefaultExportClassExtendingExpression01.js |   3 +-
 ...clarationEmitLocalClassDeclarationMixin.js |   3 +-
 .../declarationEmitNameConflicts3.js          |   3 +-
 .../declarationEmitPrivateNameCausesError.js  |   3 +-
 ...tPrivateSymbolCausesVarDeclarationEmit2.js |   3 +-
 .../declarationEmitProtectedMembers.js        |   3 +-
 .../declarationEmitThisPredicates01.js        |   3 +-
 ...tionEmitThisPredicatesWithPrivateName01.js |   3 +-
 .../declarationNoDanglingGenerics.js          |   3 +-
 ...clarationsForFileShadowingGlobalNoError.js |   3 +-
 .../reference/declareDottedExtend.js          |   3 +-
 .../baselines/reference/decoratorOnClass9.js  |   3 +-
 .../reference/decoratorOnClassConstructor2.js |   3 +-
 .../reference/decoratorOnClassConstructor3.js |   3 +-
 .../reference/decoratorOnClassConstructor4.js |   3 +-
 .../reference/decoratorOnClassMethod12.js     |   3 +-
 .../defaultPropsEmptyCurlyBecomesAnyForJs.js  |   6 +-
 .../reference/defineProperty(target=es5).js   |   3 +-
 ...edClassConstructorWithExplicitReturns01.js |   3 +-
 ...assConstructorWithExplicitReturns01.js.map |   2 +-
 ...tructorWithExplicitReturns01.sourcemap.txt | 239 +++---
 ...derivedClassConstructorWithoutSuperCall.js |   3 +-
 ...ClassFunctionOverridesBaseClassAccessor.js |   3 +-
 .../derivedClassIncludesInheritedMembers.js   |   3 +-
 ...idesIndexersWithAssignmentCompatibility.js |   3 +-
 .../derivedClassOverridesPrivateFunction1.js  |   3 +-
 .../derivedClassOverridesPrivates.js          |   3 +-
 .../derivedClassOverridesProtectedMembers.js  |   3 +-
 .../derivedClassOverridesProtectedMembers2.js |   3 +-
 .../derivedClassOverridesProtectedMembers3.js |   3 +-
 .../derivedClassOverridesProtectedMembers4.js |   3 +-
 .../derivedClassOverridesPublicMembers.js     |   3 +-
 .../derivedClassOverridesWithoutSubtype.js    |   3 +-
 .../derivedClassParameterProperties.js        |   3 +-
 ...dClassSuperCallsInNonConstructorMembers.js |   3 +-
 .../derivedClassSuperCallsWithThisArg.js      |   3 +-
 .../reference/derivedClassTransitivity.js     |   3 +-
 .../reference/derivedClassTransitivity2.js    |   3 +-
 .../reference/derivedClassTransitivity3.js    |   3 +-
 .../reference/derivedClassTransitivity4.js    |   3 +-
 .../reference/derivedClassWithAny.js          |   3 +-
 ...ivateInstanceShadowingProtectedInstance.js |   3 +-
 ...hPrivateInstanceShadowingPublicInstance.js |   3 +-
 ...thPrivateStaticShadowingProtectedStatic.js |   3 +-
 ...sWithPrivateStaticShadowingPublicStatic.js |   3 +-
 .../derivedClassWithoutExplicitConstructor.js |   3 +-
 ...derivedClassWithoutExplicitConstructor2.js |   3 +-
 ...derivedClassWithoutExplicitConstructor3.js |   3 +-
 tests/baselines/reference/derivedClasses.js   |   3 +-
 .../reference/derivedGenericClassWithAny.js   |   3 +-
 ...sesHiddenBaseCallViaSuperPropertyAccess.js |   3 +-
 .../derivedTypeDoesNotRequireExtendsClause.js |   3 +-
 ...derivedUninitializedPropertyDeclaration.js |   3 +-
 .../destructuringParameterDeclaration5.js     |   3 +-
 ...oubleMixinConditionalTypeBaseClassWorks.js |   3 +-
 .../emitBundleWithPrologueDirectives1.js      |   3 +-
 .../reference/emitBundleWithShebang1.js       |   3 +-
 .../reference/emitBundleWithShebang2.js       |   3 +-
 ...BundleWithShebangAndPrologueDirectives1.js |   3 +-
 ...BundleWithShebangAndPrologueDirectives2.js |   3 +-
 ...tionWithPropertyAccessInHeritageClause1.js |   3 +-
 .../emitClassExpressionInDeclarationFile.js   |   3 +-
 .../emitClassExpressionInDeclarationFile2.js  |   3 +-
 ...BeforeEmitParameterPropertyDeclaration1.js |   3 +-
 ...SuperCallBeforeEmitPropertyDeclaration1.js |   3 +-
 ...arationAndParameterPropertyDeclaration1.js |   3 +-
 .../reference/emitThisInSuperMethodCall.js    |   3 +-
 ...mitter.asyncGenerators.classMethods.es5.js |   3 +-
 tests/baselines/reference/emptyModuleName.js  |   3 +-
 ...rorForwardReferenceForwadingConstructor.js |   3 +-
 tests/baselines/reference/errorSuperCalls.js  |   3 +-
 .../reference/errorSuperPropertyAccess.js     |   3 +-
 .../reference/errorsInGenericTypeReference.js |   3 +-
 .../reference/es6ClassSuperCodegenBug.js      |   3 +-
 tests/baselines/reference/es6ClassTest.js     |   3 +-
 tests/baselines/reference/es6ClassTest2.js    |   3 +-
 tests/baselines/reference/es6ClassTest7.js    |   3 +-
 .../exportAssignmentOfGenericType1.js         |   3 +-
 .../exportClassExtendingIntersection.js       |   6 +-
 .../exportDeclarationInInternalModule.js      |   3 +-
 .../reference/exportDefaultAbstractClass.js   |   6 +-
 tests/baselines/reference/extBaseClass1.js    |   3 +-
 tests/baselines/reference/extBaseClass2.js    |   3 +-
 .../extendAndImplementTheSameBaseType.js      |   3 +-
 .../extendAndImplementTheSameBaseType2.js     |   3 +-
 .../extendBaseClassBeforeItsDeclared.js       |   3 +-
 .../extendClassExpressionFromModule.js        |   3 +-
 .../extendConstructSignatureInInterface.js    |   3 +-
 tests/baselines/reference/extendFromAny.js    |   3 +-
 .../reference/extendNonClassSymbol1.js        |   3 +-
 .../reference/extendNonClassSymbol2.js        |   3 +-
 .../extendPrivateConstructorClass.js          |   3 +-
 ...xtendingClassFromAliasAndUsageInIndexer.js |   6 +-
 tests/baselines/reference/extendsClause.js    |   3 +-
 .../reference/extendsClauseAlreadySeen.js     |   3 +-
 .../reference/extendsClauseAlreadySeen2.js    |   3 +-
 .../reference/extendsUntypedModule.js         |   3 +-
 tests/baselines/reference/fluentClasses.js    |   3 +-
 tests/baselines/reference/for-inStatements.js |   3 +-
 .../reference/for-inStatementsInvalid.js      |   3 +-
 .../forStatementsMultipleInvalidDecl.js       |   3 +-
 .../reference/functionImplementationErrors.js |   3 +-
 .../reference/functionImplementations.js      |   3 +-
 .../reference/functionSubtypingOfVarArgs.js   |   3 +-
 .../reference/functionSubtypingOfVarArgs2.js  |   3 +-
 .../reference/generatedContextualTyping.js    |   3 +-
 .../genericBaseClassLiteralProperty.js        |   3 +-
 .../genericBaseClassLiteralProperty2.js       |   3 +-
 ...allWithConstraintsTypeArgumentInference.js |   3 +-
 .../genericCallWithObjectTypeArgs2.js         |   3 +-
 ...icCallWithObjectTypeArgsAndConstraints2.js |   3 +-
 ...icCallWithObjectTypeArgsAndConstraints3.js |   3 +-
 .../genericCallbacksAndClassHierarchy.js      |   3 +-
 .../genericClassExpressionInFunction.js       |   3 +-
 ...sInheritsConstructorFromNonGenericClass.js |   3 +-
 ...cClassPropertyInheritanceSpecialization.js |   3 +-
 .../reference/genericClassStaticMethod.js     |   3 +-
 tests/baselines/reference/genericClasses3.js  |   3 +-
 ...genericConstraintOnExtendedBuiltinTypes.js |   3 +-
 ...enericConstraintOnExtendedBuiltinTypes2.js |   3 +-
 .../genericDerivedTypeWithSpecializedBase.js  |   3 +-
 .../genericDerivedTypeWithSpecializedBase2.js |   3 +-
 .../genericInheritedDefaultConstructors.js    |   3 +-
 .../reference/genericPrototypeProperty2.js    |   3 +-
 .../reference/genericPrototypeProperty3.js    |   3 +-
 ...ericRecursiveImplicitConstructorErrors2.js |   3 +-
 ...ericRecursiveImplicitConstructorErrors3.js |   3 +-
 .../reference/genericTypeAssertions2.js       |   3 +-
 .../reference/genericTypeAssertions4.js       |   3 +-
 .../reference/genericTypeAssertions6.js       |   3 +-
 .../reference/genericTypeConstraints.js       |   3 +-
 ...genericTypeReferenceWithoutTypeArgument.js |   3 +-
 ...enericTypeReferenceWithoutTypeArgument2.js |   3 +-
 .../genericWithIndexerOfTypeParameterType2.js |   3 +-
 .../reference/heterogeneousArrayLiterals.js   |   3 +-
 .../reference/ifDoWhileStatements.js          |   3 +-
 .../illegalSuperCallsInConstructor.js         |   3 +-
 .../implementClausePrecedingExtends.js        |   3 +-
 ...gAnInterfaceExtendingClassWithPrivates2.js |   3 +-
 ...AnInterfaceExtendingClassWithProtecteds.js |   3 +-
 .../baselines/reference/importAsBaseClass.js  |   3 +-
 tests/baselines/reference/importHelpers.js    |   3 +-
 .../reference/importHelpersNoHelpers.js       |   3 +-
 .../reference/importHelpersNoModule.js        |   3 +-
 .../reference/importNotElidedWhenNotFound.js  |   3 +-
 .../reference/importShadowsGlobalName.js      |   3 +-
 .../reference/importUsedInExtendsList1.js     |   3 +-
 ...eyofNestedSimplifiedSubstituteUnwrapped.js |   3 +-
 .../reference/indexedAccessRelation.js        |   3 +-
 .../reference/indexedAccessTypeConstraints.js |   3 +-
 .../reference/indexerConstraints2.js          |   3 +-
 .../reference/indirectSelfReference.js        |   3 +-
 .../reference/indirectSelfReferenceGeneric.js |   3 +-
 .../infinitelyExpandingTypesNonGenericBase.js |   3 +-
 .../inheritFromGenericTypeParameter.js        |   3 +-
 ...SameNamePrivatePropertiesFromSameOrigin.js |   3 +-
 tests/baselines/reference/inheritance.js      |   3 +-
 tests/baselines/reference/inheritance1.js     |   3 +-
 ...itanceGrandParentPrivateMemberCollision.js |   3 +-
 ...tPrivateMemberCollisionWithPublicMember.js |   3 +-
 ...tPublicMemberCollisionWithPrivateMember.js |   3 +-
 ...ritanceMemberAccessorOverridingAccessor.js |   3 +-
 ...heritanceMemberAccessorOverridingMethod.js |   3 +-
 ...ritanceMemberAccessorOverridingProperty.js |   3 +-
 ...inheritanceMemberFuncOverridingAccessor.js |   3 +-
 .../inheritanceMemberFuncOverridingMethod.js  |   3 +-
 ...inheritanceMemberFuncOverridingProperty.js |   3 +-
 ...ritanceMemberPropertyOverridingAccessor.js |   3 +-
 ...heritanceMemberPropertyOverridingMethod.js |   3 +-
 ...ritanceMemberPropertyOverridingProperty.js |   3 +-
 .../inheritanceOfGenericConstructorMethod1.js |   3 +-
 .../inheritanceOfGenericConstructorMethod2.js |   3 +-
 ...ritanceStaticAccessorOverridingAccessor.js |   3 +-
 ...heritanceStaticAccessorOverridingMethod.js |   3 +-
 ...ritanceStaticAccessorOverridingProperty.js |   3 +-
 ...inheritanceStaticFuncOverridingAccessor.js |   3 +-
 ...eStaticFuncOverridingAccessorOfFuncType.js |   3 +-
 .../inheritanceStaticFuncOverridingMethod.js  |   3 +-
 ...inheritanceStaticFuncOverridingProperty.js |   3 +-
 ...eStaticFuncOverridingPropertyOfFuncType.js |   3 +-
 ...taticFunctionOverridingInstanceProperty.js |   3 +-
 .../inheritanceStaticMembersCompatible.js     |   3 +-
 .../inheritanceStaticMembersIncompatible.js   |   3 +-
 ...ritanceStaticPropertyOverridingAccessor.js |   3 +-
 ...heritanceStaticPropertyOverridingMethod.js |   3 +-
 ...ritanceStaticPropertyOverridingProperty.js |   3 +-
 .../inheritedConstructorWithRestParams.js     |   3 +-
 .../inheritedConstructorWithRestParams2.js    |   3 +-
 .../inheritedModuleMembersForClodule.js       |   3 +-
 .../reference/instanceOfAssignability.js      |   3 +-
 ...nstancePropertiesInheritedIntoClassType.js |   3 +-
 .../reference/instanceSubtypeCheck2.js        |   3 +-
 ...nstanceofWithStructurallyIdenticalTypes.js |   3 +-
 .../instantiatedReturnTypeContravariance.js   |   3 +-
 .../reference/interfaceClassMerging.js        |   3 +-
 .../reference/interfaceClassMerging2.js       |   3 +-
 .../reference/interfaceExtendsClass1.js       |   3 +-
 .../interfaceExtendsClassWithPrivate1.js      |   3 +-
 .../interfaceExtendsClassWithPrivate2.js      |   3 +-
 .../interfaceExtendsObjectIntersection.js     |   3 +-
 ...nterfaceExtendsObjectIntersectionErrors.js |   3 +-
 .../reference/interfaceImplementation8.js     |   3 +-
 .../invalidModuleWithStatementsOfEveryKind.js |   3 +-
 .../invalidMultipleVariableDeclarations.js    |   3 +-
 .../reference/invalidReturnStatements.js      |   3 +-
 .../isolatedModulesImportExportElision.js     |   3 +-
 .../jsDeclarationsClassExtendsVisibility.js   |   3 +-
 .../reference/jsDeclarationsClasses.js        |   3 +-
 .../reference/jsDeclarationsClassesErr.js     |   3 +-
 .../reference/jsDeclarationsDefault.js        |   3 +-
 ...NoImplicitAnyNoCascadingReferenceErrors.js |   3 +-
 tests/baselines/reference/jsdocTypeTagCast.js |   3 +-
 .../reference/jsxCallbackWithDestructuring.js |   3 +-
 ...ldConfusableWithMultipleChildrenNoError.js |   3 +-
 .../baselines/reference/jsxHasLiteralType.js  |   3 +-
 .../baselines/reference/jsxInExtendsClause.js |   3 +-
 tests/baselines/reference/jsxViaImport.2.js   |   3 +-
 tests/baselines/reference/jsxViaImport.js     |   3 +-
 .../reference/keyofAndIndexedAccess.js        |   3 +-
 tests/baselines/reference/lambdaArgCrash.js   |   3 +-
 tests/baselines/reference/lift.js             |   3 +-
 tests/baselines/reference/localTypes1.js      |   3 +-
 tests/baselines/reference/m7Bugs.js           |   3 +-
 .../reference/mappedTypePartialConstraints.js |   3 +-
 .../reference/mergedDeclarations5.js          |   3 +-
 .../reference/mergedDeclarations6.js          |   3 +-
 .../mergedInheritedClassInterface.js          |   3 +-
 ...rgedInheritedMembersSatisfyAbstractBase.js |   3 +-
 .../mergedInterfacesWithInheritedPrivates2.js |   3 +-
 .../mergedInterfacesWithInheritedPrivates3.js |   3 +-
 .../missingPropertiesOfClassExpression.js     |   3 +-
 .../reference/mixinAccessModifiers.js         |   3 +-
 .../reference/mixinClassesAnnotated.js        |   3 +-
 .../reference/mixinClassesAnonymous.js        |   3 +-
 .../reference/mixinClassesMembers.js          |   3 +-
 .../mixinIntersectionIsValidbaseType.js       |   3 +-
 .../reference/mixinPrivateAndProtected.js     |   3 +-
 .../reference/mixingApparentTypeOverrides.js  |   3 +-
 tests/baselines/reference/moduleAsBaseType.js |   3 +-
 .../moduleImportedForTypeArgumentPosition.js  |   3 +-
 .../baselines/reference/moduleNoneOutFile.js  |   3 +-
 .../moduleWithStatementsOfEveryKind.js        |   3 +-
 .../reference/multipleInheritance.js          |   3 +-
 .../mutuallyRecursiveGenericBaseTypes2.js     |   3 +-
 .../reference/mutuallyRecursiveInference.js   |   3 +-
 .../reference/narrowingOfDottedNames.js       |   3 +-
 .../reference/neverReturningFunctions1.js     |   3 +-
 tests/baselines/reference/newTarget.es5.js    |   3 +-
 tests/baselines/reference/noCrashOnMixin.js   |   3 +-
 .../noImplicitAnyMissingGetAccessor.js        |   3 +-
 .../noImplicitAnyMissingSetAccessor.js        |   3 +-
 ...enericClassExtendingGenericClassWithAny.js |   3 +-
 ...cIndexerConstrainsPropertyDeclarations2.js |   3 +-
 .../reference/numericIndexerConstraint3.js    |   3 +-
 .../reference/numericIndexerConstraint4.js    |   3 +-
 .../reference/numericIndexerTyping2.js        |   3 +-
 ...objectCreationOfElementAccessExpression.js |   3 +-
 ...objectTypeHidingMembersOfExtendedObject.js |   3 +-
 ...objectTypesIdentityWithNumericIndexers1.js |   3 +-
 ...objectTypesIdentityWithNumericIndexers2.js |   3 +-
 ...objectTypesIdentityWithNumericIndexers3.js |   3 +-
 .../objectTypesIdentityWithPrivates.js        |   3 +-
 .../objectTypesIdentityWithPrivates2.js       |   3 +-
 .../objectTypesIdentityWithPrivates3.js       |   3 +-
 .../objectTypesIdentityWithStringIndexers.js  |   3 +-
 .../objectTypesIdentityWithStringIndexers2.js |   3 +-
 .../optionalConstructorArgInSuper.js          |   3 +-
 tests/baselines/reference/optionalMethods.js  |   3 +-
 .../reference/optionalParamArgsTest.js        |   3 +-
 .../reference/optionalParamInOverride.js      |   3 +-
 .../reference/optionalParameterProperty.js    |   3 +-
 .../baselines/reference/outModuleConcatAmd.js |   3 +-
 .../reference/outModuleConcatAmd.js.map       |   2 +-
 .../outModuleConcatAmd.sourcemap.txt          |  59 +-
 .../reference/outModuleConcatSystem.js        |   3 +-
 .../reference/outModuleConcatSystem.js.map    |   2 +-
 .../outModuleConcatSystem.sourcemap.txt       |  59 +-
 .../reference/outModuleTripleSlashRefs.js     |   3 +-
 .../reference/outModuleTripleSlashRefs.js.map |   2 +-
 .../outModuleTripleSlashRefs.sourcemap.txt    |  87 +-
 tests/baselines/reference/overload1.js        |   3 +-
 .../overloadOnConstConstraintChecks1.js       |   3 +-
 .../overloadOnConstConstraintChecks2.js       |   3 +-
 .../overloadOnConstConstraintChecks3.js       |   3 +-
 .../overloadOnConstConstraintChecks4.js       |   3 +-
 .../overloadOnConstantsInvalidOverload1.js    |   3 +-
 .../baselines/reference/overloadResolution.js |   3 +-
 .../overloadResolutionClassConstructors.js    |   3 +-
 .../overloadResolutionConstructors.js         |   3 +-
 .../reference/overloadingOnConstants1.js      |   3 +-
 .../reference/overloadingOnConstants2.js      |   3 +-
 .../overrideBaseIntersectionMethod.js         |   3 +-
 .../overridingPrivateStaticMembers.js         |   3 +-
 .../reference/parseErrorInHeritageClause1.js  |   3 +-
 tests/baselines/reference/parser509630.js     |   3 +-
 tests/baselines/reference/parserAstSpans1.js  |   3 +-
 .../reference/parserClassDeclaration1.js      |   3 +-
 .../reference/parserClassDeclaration3.js      |   3 +-
 .../reference/parserClassDeclaration4.js      |   3 +-
 .../reference/parserClassDeclaration5.js      |   3 +-
 .../reference/parserClassDeclaration6.js      |   3 +-
 ...rrorRecovery_ExtendsOrImplementsClause2.js |   3 +-
 ...rrorRecovery_ExtendsOrImplementsClause4.js |   3 +-
 ...rrorRecovery_ExtendsOrImplementsClause5.js |   3 +-
 .../parserGenericsInTypeContexts1.js          |   3 +-
 .../parserGenericsInTypeContexts2.js          |   3 +-
 .../baselines/reference/parserRealSource10.js |   3 +-
 .../baselines/reference/parserRealSource11.js |   3 +-
 tests/baselines/reference/parserharness.js    |   3 +-
 ...artiallyAnnotatedFunctionInferenceError.js |   3 +-
 ...tatedFunctionInferenceWithTypeParameter.js |   3 +-
 tests/baselines/reference/primitiveMembers.js |   3 +-
 tests/baselines/reference/privacyClass.js     |   3 +-
 .../privacyClassExtendsClauseDeclFile.js      |   6 +-
 tests/baselines/reference/privacyGloClass.js  |   3 +-
 .../reference/privateAccessInSubclass1.js     |   3 +-
 .../privateInstanceMemberAccessibility.js     |   3 +-
 ...tedMembersAreNotAccessibleDestructuring.js |   3 +-
 .../privateStaticMemberAccessibility.js       |   3 +-
 .../privateStaticNotAccessibleInClodule2.js   |   3 +-
 .../amd/testGlo.js                            |   3 +-
 .../node/testGlo.js                           |   3 +-
 .../reference/project/prologueEmit/amd/out.js |   3 +-
 .../project/prologueEmit/node/out.js          |   3 +-
 .../amd/m'ain.js                              |   3 +-
 .../node/m'ain.js                             |   3 +-
 .../reference/propertiesAndIndexers.js        |   3 +-
 tests/baselines/reference/propertyAccess.js   |   3 +-
 ...tyAccessOnTypeParameterWithConstraints2.js |   3 +-
 ...tyAccessOnTypeParameterWithConstraints3.js |   3 +-
 ...tyAccessOnTypeParameterWithConstraints5.js |   3 +-
 .../reference/propertyOverridesAccessors4.js  |   3 +-
 .../reference/propertyOverridingPrototype.js  |   3 +-
 ...sPropertyAccessibleWithinNestedSubclass.js |   3 +-
 ...PropertyAccessibleWithinNestedSubclass1.js |   3 +-
 ...edClassPropertyAccessibleWithinSubclass.js |   3 +-
 ...dClassPropertyAccessibleWithinSubclass2.js |   3 +-
 ...dClassPropertyAccessibleWithinSubclass3.js |   3 +-
 .../protectedInstanceMemberAccessibility.js   |   3 +-
 tests/baselines/reference/protectedMembers.js |   3 +-
 ...icClassPropertyAccessibleWithinSubclass.js |   3 +-
 ...cClassPropertyAccessibleWithinSubclass2.js |   3 +-
 ...solution-does-not-affect-class-heritage.js |   3 +-
 .../reactDefaultPropsInferenceSuccess.js      |   3 +-
 .../reference/reactHOCSpreadprops.js          |   3 +-
 .../reactReadonlyHOCAssignabilityReal.js      |   3 +-
 ...uxLikeDeferredInferenceAllowsAssignment.js |   3 +-
 ...lyAssignmentInSubclassOfClassExpression.js |   3 +-
 .../readonlyConstructorAssignment.js          |   3 +-
 .../reference/recursiveBaseCheck3.js          |   3 +-
 .../reference/recursiveBaseCheck4.js          |   3 +-
 .../reference/recursiveBaseCheck6.js          |   3 +-
 .../recursiveBaseConstructorCreation1.js      |   3 +-
 ...ssInstantiationsWithDefaultConstructors.js |   3 +-
 .../reference/recursiveClassReferenceTest.js  |   3 +-
 .../recursiveClassReferenceTest.js.map        |   2 +-
 .../recursiveClassReferenceTest.sourcemap.txt | 745 +++++++++---------
 .../reference/recursiveComplicatedClasses.js  |   3 +-
 ...sivelySpecializedConstructorDeclaration.js |   3 +-
 .../reference/reexportClassDefinition.js      |   3 +-
 .../reference/reexportDefaultIsCallable.js    |   3 +-
 .../reference/reexportedMissingAlias.js       |   3 +-
 ...lassDeclarationWhenInBaseTypeResolution.js |   3 +-
 .../reference/returnInConstructor1.js         |   3 +-
 tests/baselines/reference/returnStatements.js |   3 +-
 ...PredicateIsInstantiateInContextOfTarget.js |   3 +-
 ...peCheckExtendedClassInsidePublicMethod2.js |   3 +-
 ...peCheckExtendedClassInsideStaticMethod1.js |   3 +-
 tests/baselines/reference/scopeTests.js       |   3 +-
 .../reference/shadowPrivateMembers.js         |   3 +-
 ...sWithDefaultConstructorAndExtendsClause.js |   3 +-
 ...hDefaultConstructorAndExtendsClause.js.map |   2 +-
 ...tConstructorAndExtendsClause.sourcemap.txt |  75 +-
 .../specializedInheritedConstructors1.js      |   3 +-
 .../specializedOverloadWithRestParameters.js  |   3 +-
 tests/baselines/reference/staticFactory1.js   |   3 +-
 .../baselines/reference/staticInheritance.js  |   3 +-
 .../staticMemberAccessOffDerivedType1.js      |   3 +-
 .../staticMismatchBecauseOfPrototype.js       |   3 +-
 tests/baselines/reference/staticPropSuper.js  |   3 +-
 .../reference/strictModeInConstructor.js      |   3 +-
 .../reference/strictModeReservedWord.js       |   3 +-
 ...trictModeReservedWordInClassDeclaration.js |   3 +-
 ...gIndexerConstrainsPropertyDeclarations2.js |   3 +-
 ...ubSubClassCanAccessProtectedConstructor.js |   3 +-
 .../reference/subtypesOfTypeParameter.js      |   3 +-
 .../subtypesOfTypeParameterWithConstraints.js |   3 +-
 ...subtypesOfTypeParameterWithConstraints4.js |   3 +-
 ...OfTypeParameterWithRecursiveConstraints.js |   3 +-
 .../reference/subtypingTransitivity.js        |   3 +-
 .../reference/subtypingWithCallSignatures2.js |   3 +-
 .../reference/subtypingWithCallSignatures3.js |   3 +-
 .../reference/subtypingWithCallSignatures4.js |   3 +-
 .../subtypingWithConstructSignatures2.js      |   3 +-
 .../subtypingWithConstructSignatures3.js      |   3 +-
 .../subtypingWithConstructSignatures4.js      |   3 +-
 .../subtypingWithConstructSignatures5.js      |   3 +-
 .../subtypingWithConstructSignatures6.js      |   3 +-
 .../reference/subtypingWithNumericIndexer.js  |   3 +-
 .../reference/subtypingWithNumericIndexer3.js |   3 +-
 .../reference/subtypingWithNumericIndexer4.js |   3 +-
 .../reference/subtypingWithObjectMembers.js   |   3 +-
 .../reference/subtypingWithObjectMembers4.js  |   3 +-
 ...subtypingWithObjectMembersAccessibility.js |   3 +-
 ...ubtypingWithObjectMembersAccessibility2.js |   3 +-
 .../reference/subtypingWithStringIndexer.js   |   3 +-
 .../reference/subtypingWithStringIndexer3.js  |   3 +-
 .../reference/subtypingWithStringIndexer4.js  |   3 +-
 tests/baselines/reference/super.js            |   3 +-
 tests/baselines/reference/super1.js           |   3 +-
 tests/baselines/reference/super2.js           |   3 +-
 tests/baselines/reference/superAccess.js      |   3 +-
 tests/baselines/reference/superAccess2.js     |   3 +-
 .../reference/superAccessCastedCall.js        |   3 +-
 .../reference/superAccessInFatArrow1.js       |   3 +-
 .../reference/superCallArgsMustMatch.js       |   3 +-
 .../reference/superCallAssignResult.js        |   3 +-
 .../superCallBeforeThisAccessing1.js          |   3 +-
 .../superCallBeforeThisAccessing2.js          |   3 +-
 .../superCallBeforeThisAccessing3.js          |   3 +-
 .../superCallBeforeThisAccessing4.js          |   3 +-
 .../superCallBeforeThisAccessing5.js          |   3 +-
 .../superCallBeforeThisAccessing6.js          |   3 +-
 .../superCallBeforeThisAccessing7.js          |   3 +-
 .../superCallBeforeThisAccessing8.js          |   3 +-
 ...allFromClassThatDerivesFromGenericType1.js |   3 +-
 ...allFromClassThatDerivesFromGenericType2.js |   3 +-
 ...eButWithIncorrectNumberOfTypeArguments1.js |   3 +-
 ...sFromGenericTypeButWithNoTypeArguments1.js |   3 +-
 ...ivesNonGenericTypeButWithTypeArguments1.js |   3 +-
 .../reference/superCallInNonStaticMethod.js   |   3 +-
 .../reference/superCallInStaticMethod.js      |   3 +-
 .../superCallInsideClassDeclaration.js        |   3 +-
 .../superCallInsideClassExpression.js         |   3 +-
 .../superCallInsideObjectLiteralExpression.js |   3 +-
 .../reference/superCallOutsideConstructor.js  |   3 +-
 .../superCallParameterContextualTyping1.js    |   3 +-
 .../superCallParameterContextualTyping2.js    |   3 +-
 .../superCallParameterContextualTyping3.js    |   3 +-
 .../reference/superCallWithCommentEmit01.js   |   3 +-
 .../superCallWithMissingBaseClass.js          |   3 +-
 tests/baselines/reference/superCalls.js       |   3 +-
 .../reference/superCallsInConstructor.js      |   3 +-
 .../baselines/reference/superElementAccess.js |   3 +-
 tests/baselines/reference/superErrors.js      |   3 +-
 .../superHasMethodsFromMergedInterface.js     |   3 +-
 .../baselines/reference/superInCatchBlock1.js |   3 +-
 .../reference/superInConstructorParam1.js     |   3 +-
 tests/baselines/reference/superInLambdas.js   |   3 +-
 .../reference/superInObjectLiterals_ES5.js    |   3 +-
 tests/baselines/reference/superNewCall1.js    |   3 +-
 .../reference/superNoModifiersCrash.js        |   3 +-
 .../reference/superPropertyAccess.js          |   3 +-
 .../reference/superPropertyAccess1.js         |   3 +-
 .../reference/superPropertyAccess2.js         |   3 +-
 ...essInComputedPropertiesOfNestedType_ES5.js |   3 +-
 .../superPropertyAccessInSuperCall01.js       |   3 +-
 .../reference/superPropertyAccessNoError.js   |   3 +-
 .../reference/superPropertyAccess_ES5.js      |   3 +-
 ...opertyElementNoUnusedLexicalThisCapture.js |   3 +-
 ...perPropertyInConstructorBeforeSuperCall.js |   3 +-
 .../reference/superSymbolIndexedAccess5.js    |   3 +-
 .../reference/superSymbolIndexedAccess6.js    |   3 +-
 .../superWithGenericSpecialization.js         |   3 +-
 .../baselines/reference/superWithGenerics.js  |   3 +-
 .../reference/superWithTypeArgument.js        |   3 +-
 .../reference/superWithTypeArgument2.js       |   3 +-
 .../reference/superWithTypeArgument3.js       |   3 +-
 ...side-object-literal-getters-and-setters.js |   3 +-
 tests/baselines/reference/switchStatements.js |   3 +-
 .../reference/systemModuleWithSuperClass.js   |   3 +-
 .../reference/targetTypeBaseCalls.js          |   3 +-
 ...ditionalOnMethodReturnOfGenericInstance.js |   3 +-
 .../reference/thisInInvalidContexts.js        |   3 +-
 .../thisInInvalidContextsExternalModule.js    |   3 +-
 tests/baselines/reference/thisInSuperCall.js  |   3 +-
 tests/baselines/reference/thisInSuperCall1.js |   3 +-
 tests/baselines/reference/thisInSuperCall2.js |   3 +-
 tests/baselines/reference/thisInSuperCall3.js |   3 +-
 ...sIndexOnExistingReadonlyFieldIsNotNever.js |   3 +-
 .../reference/thisTypeInFunctions.js          |   3 +-
 .../reference/thisTypeInFunctions3.js         |   3 +-
 .../reference/tsxAttributeResolution15.js     |   3 +-
 .../reference/tsxAttributeResolution16.js     |   3 +-
 .../tsxCorrectlyParseLessThanComparison1.js   |   3 +-
 .../tsxDefaultAttributesResolution1.js        |   3 +-
 .../tsxDefaultAttributesResolution2.js        |   3 +-
 .../tsxDefaultAttributesResolution3.js        |   3 +-
 .../baselines/reference/tsxDynamicTagName5.js |   3 +-
 .../baselines/reference/tsxDynamicTagName7.js |   3 +-
 .../baselines/reference/tsxDynamicTagName8.js |   3 +-
 .../baselines/reference/tsxDynamicTagName9.js |   3 +-
 .../reference/tsxExternalModuleEmit1.js       |   6 +-
 .../reference/tsxFragmentChildrenCheck.js     |   3 +-
 .../reference/tsxGenericAttributesType3.js    |   3 +-
 .../reference/tsxGenericAttributesType4.js    |   3 +-
 .../reference/tsxGenericAttributesType5.js    |   3 +-
 .../reference/tsxGenericAttributesType6.js    |   3 +-
 .../reference/tsxGenericAttributesType9.js    |   3 +-
 .../reference/tsxLibraryManagedAttributes.js  |   3 +-
 .../reference/tsxNotUsingApparentTypeOfSFC.js |   3 +-
 .../tsxSpreadAttributesResolution1.js         |   3 +-
 .../tsxSpreadAttributesResolution10.js        |   3 +-
 .../tsxSpreadAttributesResolution11.js        |   3 +-
 .../tsxSpreadAttributesResolution12.js        |   3 +-
 .../tsxSpreadAttributesResolution17.js        |   3 +-
 .../tsxSpreadAttributesResolution2.js         |   3 +-
 .../tsxSpreadAttributesResolution3.js         |   3 +-
 .../tsxSpreadAttributesResolution4.js         |   3 +-
 .../tsxSpreadAttributesResolution5.js         |   3 +-
 .../tsxSpreadAttributesResolution6.js         |   3 +-
 .../tsxSpreadAttributesResolution7.js         |   3 +-
 .../tsxSpreadAttributesResolution8.js         |   3 +-
 .../tsxSpreadAttributesResolution9.js         |   3 +-
 .../tsxSpreadDoesNotReportExcessProps.js      |   3 +-
 .../tsxStatelessFunctionComponents2.js        |   3 +-
 .../reference/tsxUnionElementType3.js         |   3 +-
 .../reference/tsxUnionElementType4.js         |   3 +-
 .../reference/tsxUnionTypeComponent1.js       |   3 +-
 .../typeAliasFunctionTypeSharedSymbol.js      |   3 +-
 tests/baselines/reference/typeAssertions.js   |   3 +-
 .../baselines/reference/typeGuardFunction.js  |   3 +-
 .../reference/typeGuardFunctionErrors.js      |   3 +-
 .../reference/typeGuardFunctionGenerics.js    |   3 +-
 .../reference/typeGuardFunctionOfFormThis.js  |   3 +-
 .../typeGuardFunctionOfFormThisErrors.js      |   3 +-
 .../reference/typeGuardOfFormInstanceOf.js    |   3 +-
 .../reference/typeGuardOfFormIsType.js        |   3 +-
 .../reference/typeGuardOfFormThisMember.js    |   3 +-
 .../typeGuardOfFormThisMemberErrors.js        |   3 +-
 tests/baselines/reference/typeMatch2.js       |   3 +-
 tests/baselines/reference/typeOfSuperCall.js  |   3 +-
 .../reference/typeParameterAsBaseClass.js     |   3 +-
 .../reference/typeParameterAsBaseType.js      |   3 +-
 .../reference/typeParameterExtendingUnion1.js |   3 +-
 .../reference/typeParameterExtendingUnion2.js |   3 +-
 .../baselines/reference/typeRelationships.js  |   3 +-
 .../baselines/reference/typeValueConflict1.js |   3 +-
 .../baselines/reference/typeValueConflict2.js |   3 +-
 .../reference/typeVariableTypeGuards.js       |   3 +-
 tests/baselines/reference/typeofClass2.js     |   3 +-
 .../typesWithSpecializedCallSignatures.js     |   3 +-
 ...typesWithSpecializedConstructSignatures.js |   3 +-
 tests/baselines/reference/undeclaredBase.js   |   3 +-
 .../undefinedIsSubtypeOfEverything.js         |   3 +-
 .../baselines/reference/underscoreMapFirst.js |   3 +-
 .../underscoreThisInDerivedClass01.js         |   3 +-
 .../underscoreThisInDerivedClass02.js         |   3 +-
 .../reference/unionTypeEquivalence.js         |   3 +-
 .../reference/unionTypeFromArrayLiteral.js    |   3 +-
 .../reference/unionTypesAssignability.js      |   3 +-
 tests/baselines/reference/unknownSymbols1.js  |   3 +-
 .../reference/unspecializedConstraints.js     |   3 +-
 ...untypedFunctionCallsWithTypeParameters1.js |   3 +-
 .../reference/unusedClassesinNamespace4.js    |   3 +-
 .../unusedIdentifiersConsolidated1.js         |   3 +-
 .../reference/unusedInvalidTypeArguments.js   |   6 +-
 .../useBeforeDeclaration_superClass.js        |   3 +-
 .../reference/validUseOfThisInSuper.js        |   3 +-
 .../reference/varArgsOnConstructorTypes.js    |   3 +-
 ...ndZeroOrderIndexSignatureRelationsAlign.js |   3 +-
 ...dZeroOrderIndexSignatureRelationsAlign2.js |   3 +-
 813 files changed, 2335 insertions(+), 1514 deletions(-)

diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 88484396008..37cdf009524 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -62,9 +62,9 @@ namespace ts {
     }
 
     const enum Jump {
-        Break = 1 << 1,
-        Continue = 1 << 2,
-        Return = 1 << 3
+        Break       = 1 << 1,
+        Continue    = 1 << 2,
+        Return      = 1 << 3
     }
 
     interface ConvertedLoopState {
@@ -1597,7 +1597,7 @@ namespace ts {
             if (!isPrivateIdentifier(propertyName) && context.getCompilerOptions().useDefineForClassFields) {
                 const name = isComputedPropertyName(propertyName) ? propertyName.expression
                     : isIdentifier(propertyName) ? createStringLiteral(unescapeLeadingUnderscores(propertyName.escapedText))
-                        : propertyName;
+                    : propertyName;
                 e = createObjectDefinePropertyCall(receiver, name, createPropertyDescriptor({ value: memberFunction, enumerable: false, writable: true, configurable: true }));
             }
             else {
@@ -2418,28 +2418,28 @@ namespace ts {
             const forStatement = setTextRange(
                 createFor(
                     /*initializer*/ setEmitFlags(
-                    setTextRange(
-                        createVariableDeclarationList([
-                            setTextRange(createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0)), moveRangePos(node.expression, -1)),
-                            setTextRange(createVariableDeclaration(rhsReference, /*type*/ undefined, expression), node.expression)
-                        ]),
+                        setTextRange(
+                            createVariableDeclarationList([
+                                setTextRange(createVariableDeclaration(counter, /*type*/ undefined, createLiteral(0)), moveRangePos(node.expression, -1)),
+                                setTextRange(createVariableDeclaration(rhsReference, /*type*/ undefined, expression), node.expression)
+                            ]),
+                            node.expression
+                        ),
+                        EmitFlags.NoHoisting
+                    ),
+                    /*condition*/ setTextRange(
+                        createLessThan(
+                            counter,
+                            createPropertyAccess(rhsReference, "length")
+                        ),
                         node.expression
                     ),
-                    EmitFlags.NoHoisting
-                ),
-                    /*condition*/ setTextRange(
-                    createLessThan(
-                        counter,
-                        createPropertyAccess(rhsReference, "length")
-                    ),
-                    node.expression
-                ),
                     /*incrementor*/ setTextRange(createPostfixIncrement(counter), node.expression),
                     /*statement*/ convertForOfStatementHead(
-                    node,
-                    createElementAccess(rhsReference, counter),
-                    convertedLoopBodyStatements
-                )
+                        node,
+                        createElementAccess(rhsReference, counter),
+                        convertedLoopBodyStatements
+                    )
                 ),
                 /*location*/ node
             );
@@ -2472,22 +2472,22 @@ namespace ts {
                 setTextRange(
                     createFor(
                         /*initializer*/ setEmitFlags(
-                        setTextRange(
-                            createVariableDeclarationList([
-                                setTextRange(createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression),
-                                createVariableDeclaration(result, /*type*/ undefined, next)
-                            ]),
-                            node.expression
+                            setTextRange(
+                                createVariableDeclarationList([
+                                    setTextRange(createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression),
+                                    createVariableDeclaration(result, /*type*/ undefined, next)
+                                ]),
+                                node.expression
+                            ),
+                            EmitFlags.NoHoisting
                         ),
-                        EmitFlags.NoHoisting
-                    ),
                         /*condition*/ createLogicalNot(createPropertyAccess(result, "done")),
                         /*incrementor*/ createAssignment(result, next),
                         /*statement*/ convertForOfStatementHead(
-                        node,
-                        createPropertyAccess(result, "value"),
-                        convertedLoopBodyStatements
-                    )
+                            node,
+                            createPropertyAccess(result, "value"),
+                            convertedLoopBodyStatements
+                        )
                     ),
                     /*location*/ node
                 ),
@@ -2520,42 +2520,42 @@ namespace ts {
                 createBlock([
                     createTry(
                         /*tryBlock*/ createBlock([
-                        setEmitFlags(
-                            createIf(
-                                createLogicalAnd(
-                                    createLogicalAnd(
-                                        result,
-                                        createLogicalNot(
-                                            createPropertyAccess(result, "done")
-                                        )
-                                    ),
-                                    createAssignment(
-                                        returnMethod,
-                                        createPropertyAccess(iterator, "return")
-                                    )
-                                ),
-                                createExpressionStatement(
-                                    createFunctionCall(returnMethod, iterator, [])
-                                )
-                            ),
-                            EmitFlags.SingleLine
-                        ),
-                    ]),
-                        /*catchClause*/ undefined,
-                        /*finallyBlock*/ setEmitFlags(
-                        createBlock([
                             setEmitFlags(
                                 createIf(
-                                    errorRecord,
-                                    createThrow(
-                                        createPropertyAccess(errorRecord, "error")
+                                    createLogicalAnd(
+                                        createLogicalAnd(
+                                            result,
+                                            createLogicalNot(
+                                                createPropertyAccess(result, "done")
+                                            )
+                                        ),
+                                        createAssignment(
+                                            returnMethod,
+                                            createPropertyAccess(iterator, "return")
+                                        )
+                                    ),
+                                    createExpressionStatement(
+                                        createFunctionCall(returnMethod, iterator, [])
                                     )
                                 ),
                                 EmitFlags.SingleLine
-                            )
+                            ),
                         ]),
-                        EmitFlags.SingleLine
-                    )
+                        /*catchClause*/ undefined,
+                        /*finallyBlock*/ setEmitFlags(
+                            createBlock([
+                                setEmitFlags(
+                                    createIf(
+                                        errorRecord,
+                                        createThrow(
+                                            createPropertyAccess(errorRecord, "error")
+                                        )
+                                    ),
+                                    EmitFlags.SingleLine
+                                )
+                            ]),
+                            EmitFlags.SingleLine
+                        )
                     )
                 ])
             );
diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
index 02f6ce4874d..9557601efee 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
index 143d8ef2604..d4cf1fe69ae 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/abstractClassInLocalScope.js b/tests/baselines/reference/abstractClassInLocalScope.js
index 54346dc0076..4f71c72da59 100644
--- a/tests/baselines/reference/abstractClassInLocalScope.js
+++ b/tests/baselines/reference/abstractClassInLocalScope.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js b/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
index 2f9b2b1de8d..fe0304dc8bd 100644
--- a/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
+++ b/tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/abstractProperty.js b/tests/baselines/reference/abstractProperty.js
index a1f2000224d..149339bc265 100644
--- a/tests/baselines/reference/abstractProperty.js
+++ b/tests/baselines/reference/abstractProperty.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/abstractPropertyInConstructor.js b/tests/baselines/reference/abstractPropertyInConstructor.js
index 4476763061b..5c67c4c920a 100644
--- a/tests/baselines/reference/abstractPropertyInConstructor.js
+++ b/tests/baselines/reference/abstractPropertyInConstructor.js
@@ -80,8 +80,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/abstractPropertyNegative.js b/tests/baselines/reference/abstractPropertyNegative.js
index 5994aeb891e..ac5c77c59a8 100644
--- a/tests/baselines/reference/abstractPropertyNegative.js
+++ b/tests/baselines/reference/abstractPropertyNegative.js
@@ -52,8 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/accessOverriddenBaseClassMember1.js b/tests/baselines/reference/accessOverriddenBaseClassMember1.js
index ca405834ab4..b2005724d03 100644
--- a/tests/baselines/reference/accessOverriddenBaseClassMember1.js
+++ b/tests/baselines/reference/accessOverriddenBaseClassMember1.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/accessorsOverrideProperty7.js b/tests/baselines/reference/accessorsOverrideProperty7.js
index 0a866b482cd..ecfe5fc34fd 100644
--- a/tests/baselines/reference/accessorsOverrideProperty7.js
+++ b/tests/baselines/reference/accessorsOverrideProperty7.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
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 43f06a465e2..b18895a48ea 100644
--- a/tests/baselines/reference/accessors_spec_section-4.5_inference.js
+++ b/tests/baselines/reference/accessors_spec_section-4.5_inference.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
index 2bf2b18eb66..da5b2725fe9 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -47,8 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js
index 2219db0782f..68833218d2c 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js
index 6899fb5cee8..d010bdf1072 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js
index e567cb76be7..177b1a5cea7 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -44,8 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
index d970fd1878a..ae171ff395d 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -46,8 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js
index affaf4df789..0e06ab07a16 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index e6e55b76ccc..bca20359e01 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -44,8 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
index b47774b8624..9d387ff62cb 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -44,8 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -72,8 +73,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js
index 3cbd24ddc6d..c569781f1ff 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/ambiguousOverloadResolution.js b/tests/baselines/reference/ambiguousOverloadResolution.js
index b521ac03ce2..11669a4b006 100644
--- a/tests/baselines/reference/ambiguousOverloadResolution.js
+++ b/tests/baselines/reference/ambiguousOverloadResolution.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
index 61afb71509c..886f7ae5280 100644
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
+++ b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js b/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
index e13e6a8548a..36cbcaa0275 100644
--- a/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
+++ b/tests/baselines/reference/anonClassDeclarationEmitIsAnon.js
@@ -44,8 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -86,8 +87,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js b/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
index e9930fd2b1d..58a2cfc4623 100644
--- a/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
+++ b/tests/baselines/reference/anonymousClassDeclarationDoesntPrintWithReadonly.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/apparentTypeSubtyping.js b/tests/baselines/reference/apparentTypeSubtyping.js
index 550dd61e945..6d54f798fb2 100644
--- a/tests/baselines/reference/apparentTypeSubtyping.js
+++ b/tests/baselines/reference/apparentTypeSubtyping.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/apparentTypeSupertype.js b/tests/baselines/reference/apparentTypeSupertype.js
index a4121dd3f6d..09c6abe3491 100644
--- a/tests/baselines/reference/apparentTypeSupertype.js
+++ b/tests/baselines/reference/apparentTypeSupertype.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/arrayAssignmentTest1.js b/tests/baselines/reference/arrayAssignmentTest1.js
index 812b95759f6..c3f3338c811 100644
--- a/tests/baselines/reference/arrayAssignmentTest1.js
+++ b/tests/baselines/reference/arrayAssignmentTest1.js
@@ -94,8 +94,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/arrayAssignmentTest2.js b/tests/baselines/reference/arrayAssignmentTest2.js
index 2337e318ca9..fcb5ff5df68 100644
--- a/tests/baselines/reference/arrayAssignmentTest2.js
+++ b/tests/baselines/reference/arrayAssignmentTest2.js
@@ -68,8 +68,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/arrayBestCommonTypes.js b/tests/baselines/reference/arrayBestCommonTypes.js
index 13cabfa4913..9e74206c132 100644
--- a/tests/baselines/reference/arrayBestCommonTypes.js
+++ b/tests/baselines/reference/arrayBestCommonTypes.js
@@ -116,8 +116,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/arrayLiteralTypeInference.js b/tests/baselines/reference/arrayLiteralTypeInference.js
index 634859b47ea..8c9d99dc46e 100644
--- a/tests/baselines/reference/arrayLiteralTypeInference.js
+++ b/tests/baselines/reference/arrayLiteralTypeInference.js
@@ -60,8 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/arrayLiterals.js b/tests/baselines/reference/arrayLiterals.js
index 78bdc9fc129..1cf819168e5 100644
--- a/tests/baselines/reference/arrayLiterals.js
+++ b/tests/baselines/reference/arrayLiterals.js
@@ -46,8 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
index 43cadb77e14..ef77fb3ea15 100644
--- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
+++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
index a8a05b720dc..c22456b5eac 100644
--- a/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
+++ b/tests/baselines/reference/arrayOfSubtypeIsAssignableToReadonlyArray.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/arrowFunctionContexts.js b/tests/baselines/reference/arrowFunctionContexts.js
index 6c4d7091ded..84ec5e76414 100644
--- a/tests/baselines/reference/arrowFunctionContexts.js
+++ b/tests/baselines/reference/arrowFunctionContexts.js
@@ -104,8 +104,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assertionTypePredicates1.js b/tests/baselines/reference/assertionTypePredicates1.js
index 2cd17ce27dd..fa95311ea24 100644
--- a/tests/baselines/reference/assertionTypePredicates1.js
+++ b/tests/baselines/reference/assertionTypePredicates1.js
@@ -174,8 +174,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
index 9cb41738ec3..136312daaae 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.js
@@ -109,8 +109,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
index 185ec0de3be..5d172b9b5a3 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.js
@@ -108,8 +108,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
index 0592e54fec9..3f754e20256 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.js
@@ -75,8 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
index 259519e9cba..40d925b99f4 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.js
@@ -52,8 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
index 718c1e180b4..6b9ea414bba 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.js
@@ -109,8 +109,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
index ae03f422545..9a14d501a7c 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.js
@@ -108,8 +108,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
index 3d23df97b61..9b6b6f2983f 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.js
@@ -75,8 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
index 9e92e8850c0..3fd0675a214 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.js
@@ -52,8 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
index a00da29ed0d..81289abd59e 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer.js
@@ -53,8 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
index e28ba286533..ca864f24df8 100644
--- a/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
+++ b/tests/baselines/reference/assignmentCompatWithNumericIndexer3.js
@@ -50,8 +50,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
index 28fe1755600..56e0ca2b037 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers4.js
@@ -101,8 +101,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
index 62413e44a77..2af39acd2aa 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js
@@ -98,8 +98,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
index 8924ffb70a0..a8f0991cf64 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js
@@ -101,8 +101,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentCompatWithStringIndexer.js b/tests/baselines/reference/assignmentCompatWithStringIndexer.js
index 68425cd2c8c..08e335b55a9 100644
--- a/tests/baselines/reference/assignmentCompatWithStringIndexer.js
+++ b/tests/baselines/reference/assignmentCompatWithStringIndexer.js
@@ -63,8 +63,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/assignmentLHSIsValue.js b/tests/baselines/reference/assignmentLHSIsValue.js
index 92809166bb3..644f66e5abf 100644
--- a/tests/baselines/reference/assignmentLHSIsValue.js
+++ b/tests/baselines/reference/assignmentLHSIsValue.js
@@ -79,8 +79,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index 5d1cd4a385f..3cdf95df073 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/autolift4.js b/tests/baselines/reference/autolift4.js
index 7775094c62b..f96ad8fc6ab 100644
--- a/tests/baselines/reference/autolift4.js
+++ b/tests/baselines/reference/autolift4.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/baseCheck.js b/tests/baselines/reference/baseCheck.js
index 644210dc6c7..516adec8694 100644
--- a/tests/baselines/reference/baseCheck.js
+++ b/tests/baselines/reference/baseCheck.js
@@ -38,8 +38,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/baseClassImprovedMismatchErrors.js b/tests/baselines/reference/baseClassImprovedMismatchErrors.js
index be4dcf52df7..4d64e8af1d2 100644
--- a/tests/baselines/reference/baseClassImprovedMismatchErrors.js
+++ b/tests/baselines/reference/baseClassImprovedMismatchErrors.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/baseConstraintOfDecorator.js b/tests/baselines/reference/baseConstraintOfDecorator.js
index 607749f624d..396adade09b 100644
--- a/tests/baselines/reference/baseConstraintOfDecorator.js
+++ b/tests/baselines/reference/baseConstraintOfDecorator.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/baseExpressionTypeParameters.js b/tests/baselines/reference/baseExpressionTypeParameters.js
index 833c1eeae88..38f60f7fd97 100644
--- a/tests/baselines/reference/baseExpressionTypeParameters.js
+++ b/tests/baselines/reference/baseExpressionTypeParameters.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/baseIndexSignatureResolution.js b/tests/baselines/reference/baseIndexSignatureResolution.js
index fca80d0fa67..b947fd1216c 100644
--- a/tests/baselines/reference/baseIndexSignatureResolution.js
+++ b/tests/baselines/reference/baseIndexSignatureResolution.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/baseTypeOrderChecking.js b/tests/baselines/reference/baseTypeOrderChecking.js
index fe70a8d231a..9b3417dc995 100644
--- a/tests/baselines/reference/baseTypeOrderChecking.js
+++ b/tests/baselines/reference/baseTypeOrderChecking.js
@@ -45,8 +45,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/baseTypeWrappingInstantiationChain.js b/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
index d58dd744c3d..6ee6efc8933 100644
--- a/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
+++ b/tests/baselines/reference/baseTypeWrappingInstantiationChain.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/bases.js b/tests/baselines/reference/bases.js
index c59e70e0795..9f6b20a71eb 100644
--- a/tests/baselines/reference/bases.js
+++ b/tests/baselines/reference/bases.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
index 07af48dd14e..26fb7952d44 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
index 00080afbeb2..d357dd5363d 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions2.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/bestCommonTypeOfTuple2.js b/tests/baselines/reference/bestCommonTypeOfTuple2.js
index 6c838590c21..df3bd9deec0 100644
--- a/tests/baselines/reference/bestCommonTypeOfTuple2.js
+++ b/tests/baselines/reference/bestCommonTypeOfTuple2.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/callChainWithSuper(target=es5).js b/tests/baselines/reference/callChainWithSuper(target=es5).js
index b93d8a55cdf..325dc56370b 100644
--- a/tests/baselines/reference/callChainWithSuper(target=es5).js
+++ b/tests/baselines/reference/callChainWithSuper(target=es5).js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
index dd48ba034ae..f3a4ed31761 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.js
@@ -79,8 +79,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
index e977f374b95..2b10f0e3851 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.js
@@ -124,8 +124,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
index 14b65f84ed0..b98cd8a885b 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.js
@@ -59,8 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
index fdf5bfb9f4e..830901db1ca 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.js
@@ -59,8 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
index 5f0f3ac2704..cfbd3f9a181 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.js
@@ -62,8 +62,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/callWithSpread.js b/tests/baselines/reference/callWithSpread.js
index d0e765c048e..c1977dc9981 100644
--- a/tests/baselines/reference/callWithSpread.js
+++ b/tests/baselines/reference/callWithSpread.js
@@ -67,8 +67,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js b/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
index aa2797758a8..42899e76c33 100644
--- a/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
+++ b/tests/baselines/reference/captureSuperPropertyAccessInSuperCall01.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/captureThisInSuperCall.js b/tests/baselines/reference/captureThisInSuperCall.js
index 8ac9de71e98..5032900df2a 100644
--- a/tests/baselines/reference/captureThisInSuperCall.js
+++ b/tests/baselines/reference/captureThisInSuperCall.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/castingTuple.js b/tests/baselines/reference/castingTuple.js
index 3b69863c1aa..5a2f89298ce 100644
--- a/tests/baselines/reference/castingTuple.js
+++ b/tests/baselines/reference/castingTuple.js
@@ -43,8 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/chainedAssignment3.js b/tests/baselines/reference/chainedAssignment3.js
index 5a6a80b496c..81c9e0d4159 100644
--- a/tests/baselines/reference/chainedAssignment3.js
+++ b/tests/baselines/reference/chainedAssignment3.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
index 28612036cd1..dfb8d8a455c 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkForObjectTooStrict.js b/tests/baselines/reference/checkForObjectTooStrict.js
index 1cb44048734..87995535308 100644
--- a/tests/baselines/reference/checkForObjectTooStrict.js
+++ b/tests/baselines/reference/checkForObjectTooStrict.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js b/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
index 58abfe024a2..63f811a67c7 100644
--- a/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
+++ b/tests/baselines/reference/checkJsxChildrenCanBeTupleType.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxChildrenProperty12.js b/tests/baselines/reference/checkJsxChildrenProperty12.js
index 8eee35d0809..af28d3eb339 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty12.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty12.js
@@ -42,8 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxChildrenProperty13.js b/tests/baselines/reference/checkJsxChildrenProperty13.js
index 28bb2fb6ed0..480c7baabaa 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty13.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty13.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxChildrenProperty14.js b/tests/baselines/reference/checkJsxChildrenProperty14.js
index 87fedcf4da1..e213c7c05e6 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty14.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty14.js
@@ -52,8 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxChildrenProperty3.js b/tests/baselines/reference/checkJsxChildrenProperty3.js
index fa69c0b51d8..bae227dd449 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty3.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty3.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxChildrenProperty4.js b/tests/baselines/reference/checkJsxChildrenProperty4.js
index 584aa086a12..ddd75f2d3ce 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty4.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty4.js
@@ -54,8 +54,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxChildrenProperty5.js b/tests/baselines/reference/checkJsxChildrenProperty5.js
index 3b9e0839fb4..d3c34622b84 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty5.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty5.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxChildrenProperty6.js b/tests/baselines/reference/checkJsxChildrenProperty6.js
index 7513d8a0760..b4f77ae0ff6 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty6.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty6.js
@@ -53,8 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxChildrenProperty7.js b/tests/baselines/reference/checkJsxChildrenProperty7.js
index 11ba94cd593..f96a0585b0a 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty7.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty7.js
@@ -38,8 +38,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxChildrenProperty8.js b/tests/baselines/reference/checkJsxChildrenProperty8.js
index 98655f7fc76..d6e371fd197 100644
--- a/tests/baselines/reference/checkJsxChildrenProperty8.js
+++ b/tests/baselines/reference/checkJsxChildrenProperty8.js
@@ -39,8 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxIntersectionElementPropsType.js b/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
index f265559c9fa..af389ce3fce 100644
--- a/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
+++ b/tests/baselines/reference/checkJsxIntersectionElementPropsType.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
index 31b587d9da8..ed629829b97 100644
--- a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
+++ b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
index 9022b7c65ca..d99574f3051 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing1.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
index 3739b7cad0b..30de6e92a83 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing2.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
index 505f01a1dd2..6452059dd39 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing3.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
index 3712d0ff12a..bdc6e55bc32 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing4.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
index ad45f40a980..fbddda517ec 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing5.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
index fb0b44e1de5..9cfaf4afec4 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
index b5f9f0858b2..4c82d7b2b29 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
index ce089fc463b..a8301289def 100644
--- a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/circularConstraintYieldsAppropriateError.js b/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
index 7ed62aad949..1bd6fb4e401 100644
--- a/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
+++ b/tests/baselines/reference/circularConstraintYieldsAppropriateError.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/circularImportAlias.js b/tests/baselines/reference/circularImportAlias.js
index 90b42cc6469..3b3181bacb3 100644
--- a/tests/baselines/reference/circularImportAlias.js
+++ b/tests/baselines/reference/circularImportAlias.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/circularTypeofWithFunctionModule.js b/tests/baselines/reference/circularTypeofWithFunctionModule.js
index 696c3371959..d83696bfc50 100644
--- a/tests/baselines/reference/circularTypeofWithFunctionModule.js
+++ b/tests/baselines/reference/circularTypeofWithFunctionModule.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractConstructorAssignability.js b/tests/baselines/reference/classAbstractConstructorAssignability.js
index 9e0fcf0e5d5..ea86d2bf083 100644
--- a/tests/baselines/reference/classAbstractConstructorAssignability.js
+++ b/tests/baselines/reference/classAbstractConstructorAssignability.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractCrashedOnce.js b/tests/baselines/reference/classAbstractCrashedOnce.js
index 7f2129d5d00..ea2db89e9cf 100644
--- a/tests/baselines/reference/classAbstractCrashedOnce.js
+++ b/tests/baselines/reference/classAbstractCrashedOnce.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractExtends.js b/tests/baselines/reference/classAbstractExtends.js
index 32094a830b3..7dd4b30bcb0 100644
--- a/tests/baselines/reference/classAbstractExtends.js
+++ b/tests/baselines/reference/classAbstractExtends.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractFactoryFunction.js b/tests/baselines/reference/classAbstractFactoryFunction.js
index c1550c37766..7ca0b425cc8 100644
--- a/tests/baselines/reference/classAbstractFactoryFunction.js
+++ b/tests/baselines/reference/classAbstractFactoryFunction.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractGeneric.js b/tests/baselines/reference/classAbstractGeneric.js
index 3eeb4bb0866..510f492b522 100644
--- a/tests/baselines/reference/classAbstractGeneric.js
+++ b/tests/baselines/reference/classAbstractGeneric.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractInAModule.js b/tests/baselines/reference/classAbstractInAModule.js
index 37b005ed6e2..288b452c88c 100644
--- a/tests/baselines/reference/classAbstractInAModule.js
+++ b/tests/baselines/reference/classAbstractInAModule.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractInheritance.js b/tests/baselines/reference/classAbstractInheritance.js
index 8f7705ceac4..ce76c42f190 100644
--- a/tests/baselines/reference/classAbstractInheritance.js
+++ b/tests/baselines/reference/classAbstractInheritance.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractInstantiations1.js b/tests/baselines/reference/classAbstractInstantiations1.js
index fbab311025a..fd2222a5377 100644
--- a/tests/baselines/reference/classAbstractInstantiations1.js
+++ b/tests/baselines/reference/classAbstractInstantiations1.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractInstantiations2.js b/tests/baselines/reference/classAbstractInstantiations2.js
index 921453695e0..d43568f3dbb 100644
--- a/tests/baselines/reference/classAbstractInstantiations2.js
+++ b/tests/baselines/reference/classAbstractInstantiations2.js
@@ -60,8 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractOverrideWithAbstract.js b/tests/baselines/reference/classAbstractOverrideWithAbstract.js
index 9cb73f83cba..8502b5aa21e 100644
--- a/tests/baselines/reference/classAbstractOverrideWithAbstract.js
+++ b/tests/baselines/reference/classAbstractOverrideWithAbstract.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractSuperCalls.js b/tests/baselines/reference/classAbstractSuperCalls.js
index 33853b46f93..cff0842ff9b 100644
--- a/tests/baselines/reference/classAbstractSuperCalls.js
+++ b/tests/baselines/reference/classAbstractSuperCalls.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractUsingAbstractMethod1.js b/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
index e8906510a45..5099fe11971 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethod1.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classAbstractUsingAbstractMethods2.js b/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
index fe59028c08e..4e5b2ade0c8 100644
--- a/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
+++ b/tests/baselines/reference/classAbstractUsingAbstractMethods2.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classConstructorAccessibility2.js b/tests/baselines/reference/classConstructorAccessibility2.js
index 983a8e1f556..4c66edf5103 100644
--- a/tests/baselines/reference/classConstructorAccessibility2.js
+++ b/tests/baselines/reference/classConstructorAccessibility2.js
@@ -54,8 +54,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classConstructorAccessibility4.js b/tests/baselines/reference/classConstructorAccessibility4.js
index 4b1f4f31fc3..888e9c5316b 100644
--- a/tests/baselines/reference/classConstructorAccessibility4.js
+++ b/tests/baselines/reference/classConstructorAccessibility4.js
@@ -38,8 +38,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classConstructorAccessibility5.js b/tests/baselines/reference/classConstructorAccessibility5.js
index 1c1b02ac0b1..94dd91637aa 100644
--- a/tests/baselines/reference/classConstructorAccessibility5.js
+++ b/tests/baselines/reference/classConstructorAccessibility5.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility.js b/tests/baselines/reference/classConstructorParametersAccessibility.js
index 1e802bc23ab..453900bf32d 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility2.js b/tests/baselines/reference/classConstructorParametersAccessibility2.js
index 4f6dbe4b262..a6b497780ad 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility2.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility2.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classConstructorParametersAccessibility3.js b/tests/baselines/reference/classConstructorParametersAccessibility3.js
index 4fb60b4043b..13cd7db5e4a 100644
--- a/tests/baselines/reference/classConstructorParametersAccessibility3.js
+++ b/tests/baselines/reference/classConstructorParametersAccessibility3.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
index 7f86dce2fbc..2c9c7ae1642 100644
--- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
+++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classDeclaredBeforeClassFactory.js b/tests/baselines/reference/classDeclaredBeforeClassFactory.js
index 3d7f1adae46..f3664491f83 100644
--- a/tests/baselines/reference/classDeclaredBeforeClassFactory.js
+++ b/tests/baselines/reference/classDeclaredBeforeClassFactory.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classDoesNotDependOnBaseTypes.js b/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
index da9194cf488..2369bda834d 100644
--- a/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
+++ b/tests/baselines/reference/classDoesNotDependOnBaseTypes.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExpression2.js b/tests/baselines/reference/classExpression2.js
index 8dd5771c29f..0dd173f34e8 100644
--- a/tests/baselines/reference/classExpression2.js
+++ b/tests/baselines/reference/classExpression2.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExpression3.js b/tests/baselines/reference/classExpression3.js
index 5dcee4b5193..16ea2823a2f 100644
--- a/tests/baselines/reference/classExpression3.js
+++ b/tests/baselines/reference/classExpression3.js
@@ -15,8 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExpressionExtendingAbstractClass.js b/tests/baselines/reference/classExpressionExtendingAbstractClass.js
index a9a89ac9a96..bef91534fe1 100644
--- a/tests/baselines/reference/classExpressionExtendingAbstractClass.js
+++ b/tests/baselines/reference/classExpressionExtendingAbstractClass.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExpressionInClassStaticDeclarations.js b/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
index 9c4e258b70d..1c8fa8aa34e 100644
--- a/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
+++ b/tests/baselines/reference/classExpressionInClassStaticDeclarations.js
@@ -12,8 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendingBuiltinType.js b/tests/baselines/reference/classExtendingBuiltinType.js
index f857b4209a7..83cd9b04bfa 100644
--- a/tests/baselines/reference/classExtendingBuiltinType.js
+++ b/tests/baselines/reference/classExtendingBuiltinType.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendingClass.js b/tests/baselines/reference/classExtendingClass.js
index 5e404484a6d..1b6b7f9a76a 100644
--- a/tests/baselines/reference/classExtendingClass.js
+++ b/tests/baselines/reference/classExtendingClass.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendingClassLikeType.js b/tests/baselines/reference/classExtendingClassLikeType.js
index 1ae632084ae..61af83d198d 100644
--- a/tests/baselines/reference/classExtendingClassLikeType.js
+++ b/tests/baselines/reference/classExtendingClassLikeType.js
@@ -67,8 +67,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendingNonConstructor.js b/tests/baselines/reference/classExtendingNonConstructor.js
index e9d5c1b85a9..a1698b831d3 100644
--- a/tests/baselines/reference/classExtendingNonConstructor.js
+++ b/tests/baselines/reference/classExtendingNonConstructor.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendingNull.js b/tests/baselines/reference/classExtendingNull.js
index bfa7e0360fd..65c4fff4373 100644
--- a/tests/baselines/reference/classExtendingNull.js
+++ b/tests/baselines/reference/classExtendingNull.js
@@ -13,8 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendingPrimitive.js b/tests/baselines/reference/classExtendingPrimitive.js
index f1986f3ad34..5d9ee3c76bd 100644
--- a/tests/baselines/reference/classExtendingPrimitive.js
+++ b/tests/baselines/reference/classExtendingPrimitive.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendingPrimitive2.js b/tests/baselines/reference/classExtendingPrimitive2.js
index 1ebe2be1836..9cca267f309 100644
--- a/tests/baselines/reference/classExtendingPrimitive2.js
+++ b/tests/baselines/reference/classExtendingPrimitive2.js
@@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendingQualifiedName.js b/tests/baselines/reference/classExtendingQualifiedName.js
index a4493fd86f4..42d82f6ea0f 100644
--- a/tests/baselines/reference/classExtendingQualifiedName.js
+++ b/tests/baselines/reference/classExtendingQualifiedName.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendingQualifiedName2.js b/tests/baselines/reference/classExtendingQualifiedName2.js
index 34a333619b9..f0454c72f27 100644
--- a/tests/baselines/reference/classExtendingQualifiedName2.js
+++ b/tests/baselines/reference/classExtendingQualifiedName2.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js
index b4ec841a30e..953f7bd630b 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/tests/baselines/reference/classExtendsAcrossFiles.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -66,8 +67,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
index fdf721d6ac5..7613c23ae8d 100644
--- a/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassMergedWithModuleNotReferingConstructor.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
index 51cb37a7834..8ad72c59b1e 100644
--- a/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
+++ b/tests/baselines/reference/classExtendsClauseClassNotReferringConstructor.js
@@ -15,8 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsEveryObjectType.js b/tests/baselines/reference/classExtendsEveryObjectType.js
index 3977e4e1d32..6624104b8ba 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsEveryObjectType2.js b/tests/baselines/reference/classExtendsEveryObjectType2.js
index acdd2b75be8..e11d58af787 100644
--- a/tests/baselines/reference/classExtendsEveryObjectType2.js
+++ b/tests/baselines/reference/classExtendsEveryObjectType2.js
@@ -12,8 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsInterface.js b/tests/baselines/reference/classExtendsInterface.js
index c04a32bef7c..84aea7bdf8b 100644
--- a/tests/baselines/reference/classExtendsInterface.js
+++ b/tests/baselines/reference/classExtendsInterface.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsInterfaceInExpression.js b/tests/baselines/reference/classExtendsInterfaceInExpression.js
index 7e18f045760..261777267c7 100644
--- a/tests/baselines/reference/classExtendsInterfaceInExpression.js
+++ b/tests/baselines/reference/classExtendsInterfaceInExpression.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsInterfaceInModule.js b/tests/baselines/reference/classExtendsInterfaceInModule.js
index ba13cef76c6..22a852a58bd 100644
--- a/tests/baselines/reference/classExtendsInterfaceInModule.js
+++ b/tests/baselines/reference/classExtendsInterfaceInModule.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsInterface_not.js b/tests/baselines/reference/classExtendsInterface_not.js
index b71c8abed82..407e55690cc 100644
--- a/tests/baselines/reference/classExtendsInterface_not.js
+++ b/tests/baselines/reference/classExtendsInterface_not.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsItself.js b/tests/baselines/reference/classExtendsItself.js
index 4013c036cc8..1b9eac2a341 100644
--- a/tests/baselines/reference/classExtendsItself.js
+++ b/tests/baselines/reference/classExtendsItself.js
@@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly.js b/tests/baselines/reference/classExtendsItselfIndirectly.js
index a064acd93c3..fa2026179d3 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly2.js b/tests/baselines/reference/classExtendsItselfIndirectly2.js
index 14a1516ebc1..bd1d4afddce 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly2.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly2.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly3.js b/tests/baselines/reference/classExtendsItselfIndirectly3.js
index 7d800450388..4546e39b74c 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly3.js
+++ b/tests/baselines/reference/classExtendsItselfIndirectly3.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -50,8 +51,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -73,8 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -96,8 +99,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -119,8 +123,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -142,8 +147,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsMultipleBaseClasses.js b/tests/baselines/reference/classExtendsMultipleBaseClasses.js
index 199cd885c7b..27427f54141 100644
--- a/tests/baselines/reference/classExtendsMultipleBaseClasses.js
+++ b/tests/baselines/reference/classExtendsMultipleBaseClasses.js
@@ -12,8 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsNull.js b/tests/baselines/reference/classExtendsNull.js
index a2d8b670c19..82fedc750a2 100644
--- a/tests/baselines/reference/classExtendsNull.js
+++ b/tests/baselines/reference/classExtendsNull.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
index ededf2a25d3..23305ebdfce 100644
--- a/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsShadowedConstructorFunction.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtendsValidConstructorFunction.js b/tests/baselines/reference/classExtendsValidConstructorFunction.js
index 30b98303d19..cb8781c1562 100644
--- a/tests/baselines/reference/classExtendsValidConstructorFunction.js
+++ b/tests/baselines/reference/classExtendsValidConstructorFunction.js
@@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classExtensionNameOutput.js b/tests/baselines/reference/classExtensionNameOutput.js
index f7f1a5d2440..5bcc85966ae 100644
--- a/tests/baselines/reference/classExtensionNameOutput.js
+++ b/tests/baselines/reference/classExtensionNameOutput.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classHeritageWithTrailingSeparator.js b/tests/baselines/reference/classHeritageWithTrailingSeparator.js
index 6f42a9bd9a2..13537655316 100644
--- a/tests/baselines/reference/classHeritageWithTrailingSeparator.js
+++ b/tests/baselines/reference/classHeritageWithTrailingSeparator.js
@@ -12,8 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classImplementsClass2.js b/tests/baselines/reference/classImplementsClass2.js
index 97258c5c159..80f8863586f 100644
--- a/tests/baselines/reference/classImplementsClass2.js
+++ b/tests/baselines/reference/classImplementsClass2.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classImplementsClass3.js b/tests/baselines/reference/classImplementsClass3.js
index 1d48b64b809..afa01e4c613 100644
--- a/tests/baselines/reference/classImplementsClass3.js
+++ b/tests/baselines/reference/classImplementsClass3.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classImplementsClass4.js b/tests/baselines/reference/classImplementsClass4.js
index babe28a722a..5ad639f311a 100644
--- a/tests/baselines/reference/classImplementsClass4.js
+++ b/tests/baselines/reference/classImplementsClass4.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classImplementsClass5.js b/tests/baselines/reference/classImplementsClass5.js
index 655355d1375..8555a3f262c 100644
--- a/tests/baselines/reference/classImplementsClass5.js
+++ b/tests/baselines/reference/classImplementsClass5.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classImplementsClass6.js b/tests/baselines/reference/classImplementsClass6.js
index 9ea92525d96..c373354722f 100644
--- a/tests/baselines/reference/classImplementsClass6.js
+++ b/tests/baselines/reference/classImplementsClass6.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classIndexer3.js b/tests/baselines/reference/classIndexer3.js
index 83ead7522ae..a63e1777a67 100644
--- a/tests/baselines/reference/classIndexer3.js
+++ b/tests/baselines/reference/classIndexer3.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classInheritence.js b/tests/baselines/reference/classInheritence.js
index 266aad9f966..ed3e55e2726 100644
--- a/tests/baselines/reference/classInheritence.js
+++ b/tests/baselines/reference/classInheritence.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classIsSubtypeOfBaseType.js b/tests/baselines/reference/classIsSubtypeOfBaseType.js
index 0f1c14c44f1..98da3b47181 100644
--- a/tests/baselines/reference/classIsSubtypeOfBaseType.js
+++ b/tests/baselines/reference/classIsSubtypeOfBaseType.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js b/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
index 55e1239844c..8615a47ee4f 100644
--- a/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
+++ b/tests/baselines/reference/classMergedWithInterfaceMultipleBasesNoError.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classOrder2.js b/tests/baselines/reference/classOrder2.js
index bd56a6c95b4..437fe85c776 100644
--- a/tests/baselines/reference/classOrder2.js
+++ b/tests/baselines/reference/classOrder2.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classOrderBug.js b/tests/baselines/reference/classOrderBug.js
index 9a664e83bff..eb0aed3c132 100644
--- a/tests/baselines/reference/classOrderBug.js
+++ b/tests/baselines/reference/classOrderBug.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classSideInheritance1.js b/tests/baselines/reference/classSideInheritance1.js
index 5795e5c4589..48b65706657 100644
--- a/tests/baselines/reference/classSideInheritance1.js
+++ b/tests/baselines/reference/classSideInheritance1.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classSideInheritance2.js b/tests/baselines/reference/classSideInheritance2.js
index 0888735d373..67b2022c460 100644
--- a/tests/baselines/reference/classSideInheritance2.js
+++ b/tests/baselines/reference/classSideInheritance2.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classSideInheritance3.js b/tests/baselines/reference/classSideInheritance3.js
index b38b2eda85c..8d36c5915c6 100644
--- a/tests/baselines/reference/classSideInheritance3.js
+++ b/tests/baselines/reference/classSideInheritance3.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classUpdateTests.js b/tests/baselines/reference/classUpdateTests.js
index cb08b51e9f2..7ee6920b472 100644
--- a/tests/baselines/reference/classUpdateTests.js
+++ b/tests/baselines/reference/classUpdateTests.js
@@ -122,8 +122,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classUsedBeforeInitializedVariables.js b/tests/baselines/reference/classUsedBeforeInitializedVariables.js
index 226abd152d8..1dab28c11d7 100644
--- a/tests/baselines/reference/classUsedBeforeInitializedVariables.js
+++ b/tests/baselines/reference/classUsedBeforeInitializedVariables.js
@@ -48,8 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classWithBaseClassButNoConstructor.js b/tests/baselines/reference/classWithBaseClassButNoConstructor.js
index f4348a315e6..6721e1db675 100644
--- a/tests/baselines/reference/classWithBaseClassButNoConstructor.js
+++ b/tests/baselines/reference/classWithBaseClassButNoConstructor.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classWithConstructors.js b/tests/baselines/reference/classWithConstructors.js
index 18cb61863e1..57be5658324 100644
--- a/tests/baselines/reference/classWithConstructors.js
+++ b/tests/baselines/reference/classWithConstructors.js
@@ -58,8 +58,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classWithProtectedProperty.js b/tests/baselines/reference/classWithProtectedProperty.js
index 6028c76dfbc..826be5fa6f1 100644
--- a/tests/baselines/reference/classWithProtectedProperty.js
+++ b/tests/baselines/reference/classWithProtectedProperty.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classWithStaticMembers.js b/tests/baselines/reference/classWithStaticMembers.js
index 178d9900d85..094cd7a31ac 100644
--- a/tests/baselines/reference/classWithStaticMembers.js
+++ b/tests/baselines/reference/classWithStaticMembers.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/classdecl.js b/tests/baselines/reference/classdecl.js
index 66d32d477cd..a6f42a59592 100644
--- a/tests/baselines/reference/classdecl.js
+++ b/tests/baselines/reference/classdecl.js
@@ -102,8 +102,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/cloduleGenericOnSelfMember.js b/tests/baselines/reference/cloduleGenericOnSelfMember.js
index cb5b85e1be2..dfe890598cc 100644
--- a/tests/baselines/reference/cloduleGenericOnSelfMember.js
+++ b/tests/baselines/reference/cloduleGenericOnSelfMember.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/clodulesDerivedClasses.js b/tests/baselines/reference/clodulesDerivedClasses.js
index 5a61e7c209b..75d2ffeafbf 100644
--- a/tests/baselines/reference/clodulesDerivedClasses.js
+++ b/tests/baselines/reference/clodulesDerivedClasses.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
index d9faf83173b..2e9aee055c3 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInAccessors.js
@@ -48,8 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
index 2bd949cbae6..6fa8bfc0592 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInConstructor.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
index 1e461178716..54be5b45431 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInMethod.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
index b1501d33582..c5632e0d8a2 100644
--- a/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalFunctionInProperty.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
index 3e3278db6b9..8abe8522273 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInAccessors.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js b/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
index 669306e8ccc..2398903bc89 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInConstructor.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js b/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
index 463ba27cb2b..058ed5f399e 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInMethod.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js b/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
index ddcd656a833..d541d6e0ad1 100644
--- a/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
+++ b/tests/baselines/reference/collisionSuperAndLocalVarInProperty.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndNameResolution.js b/tests/baselines/reference/collisionSuperAndNameResolution.js
index ecc2b0239d6..3e7ebcd6c48 100644
--- a/tests/baselines/reference/collisionSuperAndNameResolution.js
+++ b/tests/baselines/reference/collisionSuperAndNameResolution.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndParameter.js b/tests/baselines/reference/collisionSuperAndParameter.js
index 95576841cbb..49b31b9baf7 100644
--- a/tests/baselines/reference/collisionSuperAndParameter.js
+++ b/tests/baselines/reference/collisionSuperAndParameter.js
@@ -71,8 +71,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndParameter1.js b/tests/baselines/reference/collisionSuperAndParameter1.js
index 504fd6202f5..6713c8e3dc7 100644
--- a/tests/baselines/reference/collisionSuperAndParameter1.js
+++ b/tests/baselines/reference/collisionSuperAndParameter1.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js b/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
index f54793f152e..ed4af66689a 100644
--- a/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
+++ b/tests/baselines/reference/collisionSuperAndPropertyNameAsConstuctorParameter.js
@@ -39,8 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
index 7e6ae05a727..63b0c9ca0b0 100644
--- a/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
+++ b/tests/baselines/reference/collisionThisExpressionAndLocalVarWithSuperExperssion.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/commentsInheritance.js b/tests/baselines/reference/commentsInheritance.js
index d98c1ef0622..48c5f9875be 100644
--- a/tests/baselines/reference/commentsInheritance.js
+++ b/tests/baselines/reference/commentsInheritance.js
@@ -159,8 +159,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
index b842ec25ed7..1f34a4ba2da 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalObjects.js
@@ -203,8 +203,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
index c090c4f6eaf..c5820aac9ab 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnCallSignature.js
@@ -177,8 +177,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
index c175ecaf712..95fb1535ef3 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnConstructorSignature.js
@@ -177,8 +177,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
index b535c4b4976..bc5d5fffcdd 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnIndexSignature.js
@@ -120,8 +120,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
index 425c76f36f3..654ec54a782 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedCallSignature.js
@@ -158,8 +158,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
index 74fef3246a6..a0267f10229 100644
--- a/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithNoRelationshipObjectsOnInstantiatedConstructorSignature.js
@@ -158,8 +158,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
index a04612c8250..36a8fc96d84 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
@@ -268,8 +268,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
index 1aa1f9c2ca4..a51047a2904 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
@@ -230,8 +230,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
index f533db30b72..7facdf34b27 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnIndexSignature.js
@@ -116,8 +116,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
index 12443bc7fd0..6326646f02d 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
@@ -173,8 +173,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
index 4ee3c8b58ca..f3a0d730ae6 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
@@ -173,8 +173,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
index f5510544422..cec08c5ac47 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnProperty.js
@@ -87,8 +87,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/complexClassRelationships.js b/tests/baselines/reference/complexClassRelationships.js
index 83513475dce..b95142e2c1b 100644
--- a/tests/baselines/reference/complexClassRelationships.js
+++ b/tests/baselines/reference/complexClassRelationships.js
@@ -56,8 +56,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
index b10228647f0..fff7d089798 100644
--- a/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
+++ b/tests/baselines/reference/complicatedGenericRecursiveBaseClassReference.js
@@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/compoundAssignmentLHSIsValue.js b/tests/baselines/reference/compoundAssignmentLHSIsValue.js
index 3758f1c6605..92dbd05ee78 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundAssignmentLHSIsValue.js
@@ -131,8 +131,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
index d32ed669fd6..d9fa2ce9a30 100644
--- a/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
+++ b/tests/baselines/reference/compoundExponentiationAssignmentLHSIsValue.js
@@ -94,8 +94,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/computedPropertyNames24_ES5.js b/tests/baselines/reference/computedPropertyNames24_ES5.js
index cf19bbcc892..e2f3a414716 100644
--- a/tests/baselines/reference/computedPropertyNames24_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames24_ES5.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/computedPropertyNames25_ES5.js b/tests/baselines/reference/computedPropertyNames25_ES5.js
index c85aeb8354b..fa02344de45 100644
--- a/tests/baselines/reference/computedPropertyNames25_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames25_ES5.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/computedPropertyNames26_ES5.js b/tests/baselines/reference/computedPropertyNames26_ES5.js
index 307c8bd1f9f..048f85fa1de 100644
--- a/tests/baselines/reference/computedPropertyNames26_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames26_ES5.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/computedPropertyNames27_ES5.js b/tests/baselines/reference/computedPropertyNames27_ES5.js
index 2a9e3e0c5e1..f21ed47c6dc 100644
--- a/tests/baselines/reference/computedPropertyNames27_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames27_ES5.js
@@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/computedPropertyNames28_ES5.js b/tests/baselines/reference/computedPropertyNames28_ES5.js
index d0117dd6cd9..28fa01c7293 100644
--- a/tests/baselines/reference/computedPropertyNames28_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames28_ES5.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/computedPropertyNames30_ES5.js b/tests/baselines/reference/computedPropertyNames30_ES5.js
index b0c5d636059..698c0483498 100644
--- a/tests/baselines/reference/computedPropertyNames30_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames30_ES5.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/computedPropertyNames31_ES5.js b/tests/baselines/reference/computedPropertyNames31_ES5.js
index e08f130ae19..c3f81fd59f5 100644
--- a/tests/baselines/reference/computedPropertyNames31_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames31_ES5.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/computedPropertyNames43_ES5.js b/tests/baselines/reference/computedPropertyNames43_ES5.js
index 8482c49c368..217b6ee5898 100644
--- a/tests/baselines/reference/computedPropertyNames43_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames43_ES5.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/computedPropertyNames44_ES5.js b/tests/baselines/reference/computedPropertyNames44_ES5.js
index fa4ade01dd0..4f4556e594c 100644
--- a/tests/baselines/reference/computedPropertyNames44_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames44_ES5.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/computedPropertyNames45_ES5.js b/tests/baselines/reference/computedPropertyNames45_ES5.js
index afe310df031..2d362a321bb 100644
--- a/tests/baselines/reference/computedPropertyNames45_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames45_ES5.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
index e43369a86cf..564a5fc9ccc 100644
--- a/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithIdenticalBCT.js
@@ -56,8 +56,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
index 45e4782c1c8..a7f919df1dd 100644
--- a/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
+++ b/tests/baselines/reference/conditionalOperatorWithoutIdenticalBCT.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constantOverloadFunction.js b/tests/baselines/reference/constantOverloadFunction.js
index d89d1a9d8a4..90d6d34c545 100644
--- a/tests/baselines/reference/constantOverloadFunction.js
+++ b/tests/baselines/reference/constantOverloadFunction.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
index e43b9a11c1b..fff4f8402c8 100644
--- a/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
+++ b/tests/baselines/reference/constantOverloadFunctionNoSubtypeError.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
index 9a8b227934c..f3331c5009b 100644
--- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
+++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
index 4fa6ed30d6f..51057da5d50 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.js
@@ -79,8 +79,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
index 11a9ababd25..ea051f36b58 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.js
@@ -122,8 +122,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
index ddbd0819229..ceb28ef993e 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.js
@@ -69,8 +69,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
index ac6dca30ac5..b6f817c795b 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.js
@@ -59,8 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
index 15ec6643826..becb659f7c0 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.js
@@ -62,8 +62,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructorArgs.js b/tests/baselines/reference/constructorArgs.js
index f88735b52df..7d23d6d79ee 100644
--- a/tests/baselines/reference/constructorArgs.js
+++ b/tests/baselines/reference/constructorArgs.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
index 92d8570ab0c..27b6d3c28f8 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
index 210aec197a1..fec56a77170 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.js
@@ -42,8 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.js b/tests/baselines/reference/constructorHasPrototypeProperty.js
index 27d65afe6cd..9951397b09e 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.js
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructorOverloads2.js b/tests/baselines/reference/constructorOverloads2.js
index bdf63756cd1..05a842a2c23 100644
--- a/tests/baselines/reference/constructorOverloads2.js
+++ b/tests/baselines/reference/constructorOverloads2.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructorOverloads3.js b/tests/baselines/reference/constructorOverloads3.js
index c460c94441b..c41d9b2f4ce 100644
--- a/tests/baselines/reference/constructorOverloads3.js
+++ b/tests/baselines/reference/constructorOverloads3.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructorWithCapturedSuper.js b/tests/baselines/reference/constructorWithCapturedSuper.js
index be8397ca335..4a744035945 100644
--- a/tests/baselines/reference/constructorWithCapturedSuper.js
+++ b/tests/baselines/reference/constructorWithCapturedSuper.js
@@ -61,8 +61,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
index b31a5475d06..c58d19843e2 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js
@@ -288,8 +288,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/contextualTypingArrayOfLambdas.js b/tests/baselines/reference/contextualTypingArrayOfLambdas.js
index ea5d8935047..fbe58ad0e51 100644
--- a/tests/baselines/reference/contextualTypingArrayOfLambdas.js
+++ b/tests/baselines/reference/contextualTypingArrayOfLambdas.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression.js b/tests/baselines/reference/contextualTypingOfConditionalExpression.js
index 453546633af..e74122b9210 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
index 24cdda6244d..f3246f8abf3 100644
--- a/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
+++ b/tests/baselines/reference/contextualTypingOfConditionalExpression2.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/controlFlowSuperPropertyAccess.js b/tests/baselines/reference/controlFlowSuperPropertyAccess.js
index 81450e940b7..30b2175316b 100644
--- a/tests/baselines/reference/controlFlowSuperPropertyAccess.js
+++ b/tests/baselines/reference/controlFlowSuperPropertyAccess.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
index a6f2c3ac965..d8e8abe81c9 100644
--- a/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
+++ b/tests/baselines/reference/crashInsourcePropertyIsRelatableToTargetProperty.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declFileClassExtendsNull.js b/tests/baselines/reference/declFileClassExtendsNull.js
index bbb05a73617..d27b6643840 100644
--- a/tests/baselines/reference/declFileClassExtendsNull.js
+++ b/tests/baselines/reference/declFileClassExtendsNull.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
index d753b63edaf..bc6ee7e27c0 100644
--- a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
+++ b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
index 4e8414cb0fa..672c5f64d32 100644
--- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
+++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js
index 7b5fcee16f3..a6b3a7d626a 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js
index e1382305498..e533c31005d 100644
--- a/tests/baselines/reference/declFileGenericType2.js
+++ b/tests/baselines/reference/declFileGenericType2.js
@@ -50,8 +50,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
index 2b8dd1c9fa2..43c47781845 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
index 88ae8010ff5..424e2dcfe7d 100644
--- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
+++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends.js b/tests/baselines/reference/declarationEmitExpressionInExtends.js
index 4b44b4c0233..7ad5d0f9d4a 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends2.js b/tests/baselines/reference/declarationEmitExpressionInExtends2.js
index c00eb2ce84a..91121fdcaa8 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends2.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends2.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
index b156e9bd3d6..037ad6cf347 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -52,8 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends4.js b/tests/baselines/reference/declarationEmitExpressionInExtends4.js
index 2ee00dd0033..0db8521a858 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends4.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends4.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends5.js b/tests/baselines/reference/declarationEmitExpressionInExtends5.js
index 21201fb108c..f89052b5112 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends5.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends5.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js b/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
index 63de3e68739..7fd1e0c0848 100644
--- a/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
+++ b/tests/baselines/reference/declarationEmitForDefaultExportClassExtendingExpression01.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
index 18f1017225c..328209def1e 100644
--- a/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
+++ b/tests/baselines/reference/declarationEmitLocalClassDeclarationMixin.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitNameConflicts3.js b/tests/baselines/reference/declarationEmitNameConflicts3.js
index c90c8aa43c7..e8f97f7bd15 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts3.js
+++ b/tests/baselines/reference/declarationEmitNameConflicts3.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitPrivateNameCausesError.js b/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
index 067bac4cb8e..818b35bda85 100644
--- a/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
+++ b/tests/baselines/reference/declarationEmitPrivateNameCausesError.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js b/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
index 6fd8766bf1d..a378890ec38 100644
--- a/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
+++ b/tests/baselines/reference/declarationEmitPrivateSymbolCausesVarDeclarationEmit2.js
@@ -48,8 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitProtectedMembers.js b/tests/baselines/reference/declarationEmitProtectedMembers.js
index 52d35b3474b..84b9bbbc239 100644
--- a/tests/baselines/reference/declarationEmitProtectedMembers.js
+++ b/tests/baselines/reference/declarationEmitProtectedMembers.js
@@ -58,8 +58,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js
index 59199d8c0f0..170ff04db29 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
index a155ffdb818..ad78d445e7c 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationNoDanglingGenerics.js b/tests/baselines/reference/declarationNoDanglingGenerics.js
index a946b5983dd..8de69c43c16 100644
--- a/tests/baselines/reference/declarationNoDanglingGenerics.js
+++ b/tests/baselines/reference/declarationNoDanglingGenerics.js
@@ -42,8 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js b/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
index f75108175ba..ae8a0c17d78 100644
--- a/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
+++ b/tests/baselines/reference/declarationsForFileShadowingGlobalNoError.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/declareDottedExtend.js b/tests/baselines/reference/declareDottedExtend.js
index 4af59a8e7e7..35ee4e49b38 100644
--- a/tests/baselines/reference/declareDottedExtend.js
+++ b/tests/baselines/reference/declareDottedExtend.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/decoratorOnClass9.js b/tests/baselines/reference/decoratorOnClass9.js
index 8763c3605d1..033d3d2aad3 100644
--- a/tests/baselines/reference/decoratorOnClass9.js
+++ b/tests/baselines/reference/decoratorOnClass9.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js
index 5770ba52608..4dcb1eb9f6a 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js
index 10ca7fc146e..1247ed58709 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/decoratorOnClassConstructor4.js b/tests/baselines/reference/decoratorOnClassConstructor4.js
index 485d0b90147..150b15ee0e7 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor4.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor4.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/decoratorOnClassMethod12.js b/tests/baselines/reference/decoratorOnClassMethod12.js
index 145fa37064c..ad42c9e2d3e 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.js
+++ b/tests/baselines/reference/decoratorOnClassMethod12.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js b/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
index e2fa8cbe80f..8b6874afe31 100644
--- a/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
+++ b/tests/baselines/reference/defaultPropsEmptyCurlyBecomesAnyForJs.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -63,8 +64,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/defineProperty(target=es5).js b/tests/baselines/reference/defineProperty(target=es5).js
index c0fd3589312..f1ddf5b6786 100644
--- a/tests/baselines/reference/defineProperty(target=es5).js
+++ b/tests/baselines/reference/defineProperty(target=es5).js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
index e02ce21e2a2..90ee8409287 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js
@@ -42,8 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js.map b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js.map
index 1d716082b78..b4a27645c4d 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js.map
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js.map
@@ -1,2 +1,2 @@
 //// [derivedClassConstructorWithExplicitReturns01.js.map]
-{"version":3,"file":"derivedClassConstructorWithExplicitReturns01.js","sourceRoot":"","sources":["derivedClassConstructorWithExplicitReturns01.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;IAKI,WAAY,KAAa;QAJzB,UAAK,GAAG,EAAE,CAAC;QAKP,OAAO;YACH,KAAK,EAAE,KAAK;YACZ,GAAG;gBACC,OAAO,8BAA8B,CAAC;YAC1C,CAAC;SACJ,CAAA;IACL,CAAC;IATD,eAAG,GAAH,cAAQ,OAAO,uBAAuB,CAAC,CAAC,CAAC;IAU7C,QAAC;AAAD,CAAC,AAbD,IAaC;AAED;IAAgB,qBAAC;IAGb,WAAY,CAAO;QAAP,kBAAA,EAAA,OAAO;QAAnB,YACI,kBAAM,CAAC,CAAC,SAYX;QAfD,WAAK,GAAG,cAAM,OAAA,KAAI,EAAJ,CAAI,CAAC;QAKf,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE;YACrB,UAAU,CAAA;YACV,OAAO;gBACH,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,cAAM,OAAA,KAAI,EAAJ,CAAI;gBACjB,GAAG,gBAAK,OAAO,cAAc,CAAA,CAAC,CAAC;aAClC,CAAC;SACL;;YAEG,OAAO,IAAI,CAAC;IACpB,CAAC;IACL,QAAC;AAAD,CAAC,AAjBD,CAAgB,CAAC,GAiBhB"}
\ No newline at end of file
+{"version":3,"file":"derivedClassConstructorWithExplicitReturns01.js","sourceRoot":"","sources":["derivedClassConstructorWithExplicitReturns01.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;IAKI,WAAY,KAAa;QAJzB,UAAK,GAAG,EAAE,CAAC;QAKP,OAAO;YACH,KAAK,EAAE,KAAK;YACZ,GAAG;gBACC,OAAO,8BAA8B,CAAC;YAC1C,CAAC;SACJ,CAAA;IACL,CAAC;IATD,eAAG,GAAH,cAAQ,OAAO,uBAAuB,CAAC,CAAC,CAAC;IAU7C,QAAC;AAAD,CAAC,AAbD,IAaC;AAED;IAAgB,qBAAC;IAGb,WAAY,CAAO;QAAP,kBAAA,EAAA,OAAO;QAAnB,YACI,kBAAM,CAAC,CAAC,SAYX;QAfD,WAAK,GAAG,cAAM,OAAA,KAAI,EAAJ,CAAI,CAAC;QAKf,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE;YACrB,UAAU,CAAA;YACV,OAAO;gBACH,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,cAAM,OAAA,KAAI,EAAJ,CAAI;gBACjB,GAAG,gBAAK,OAAO,cAAc,CAAA,CAAC,CAAC;aAClC,CAAC;SACL;;YAEG,OAAO,IAAI,CAAC;IACpB,CAAC;IACL,QAAC;AAAD,CAAC,AAjBD,CAAgB,CAAC,GAiBhB"}
\ No newline at end of file
diff --git a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
index c3ea5a23298..a0834cd6035 100644
--- a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
+++ b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
@@ -16,8 +16,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
->>>        if (typeof b !== "function" && b !== null)
+>>>        if (typeof b !== "function" && b !== null) {
 >>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>        }
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -27,7 +28,7 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(16, 1) Source(1, 1) + SourceIndex(0)
+1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
 ---
 >>>    function C(value) {
 1->^^^^
@@ -42,9 +43,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    
 2 >    constructor(
 3 >               value: number
-1->Emitted(17, 5) Source(6, 5) + SourceIndex(0)
-2 >Emitted(17, 16) Source(6, 17) + SourceIndex(0)
-3 >Emitted(17, 21) Source(6, 30) + SourceIndex(0)
+1->Emitted(18, 5) Source(6, 5) + SourceIndex(0)
+2 >Emitted(18, 16) Source(6, 17) + SourceIndex(0)
+3 >Emitted(18, 21) Source(6, 30) + SourceIndex(0)
 ---
 >>>        this.cProp = 10;
 1->^^^^^^^^
@@ -57,11 +58,11 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 3 >                   = 
 4 >                     10
 5 >                       ;
-1->Emitted(18, 9) Source(2, 5) + SourceIndex(0)
-2 >Emitted(18, 19) Source(2, 10) + SourceIndex(0)
-3 >Emitted(18, 22) Source(2, 13) + SourceIndex(0)
-4 >Emitted(18, 24) Source(2, 15) + SourceIndex(0)
-5 >Emitted(18, 25) Source(2, 16) + SourceIndex(0)
+1->Emitted(19, 9) Source(2, 5) + SourceIndex(0)
+2 >Emitted(19, 19) Source(2, 10) + SourceIndex(0)
+3 >Emitted(19, 22) Source(2, 13) + SourceIndex(0)
+4 >Emitted(19, 24) Source(2, 15) + SourceIndex(0)
+5 >Emitted(19, 25) Source(2, 16) + SourceIndex(0)
 ---
 >>>        return {
 1 >^^^^^^^^
@@ -74,8 +75,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    constructor(value: number) {
   >        
 2 >        return 
-1 >Emitted(19, 9) Source(7, 9) + SourceIndex(0)
-2 >Emitted(19, 16) Source(7, 16) + SourceIndex(0)
+1 >Emitted(20, 9) Source(7, 9) + SourceIndex(0)
+2 >Emitted(20, 16) Source(7, 16) + SourceIndex(0)
 ---
 >>>            cProp: value,
 1->^^^^^^^^^^^^
@@ -88,10 +89,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >            cProp
 3 >                 : 
 4 >                   value
-1->Emitted(20, 13) Source(8, 13) + SourceIndex(0)
-2 >Emitted(20, 18) Source(8, 18) + SourceIndex(0)
-3 >Emitted(20, 20) Source(8, 20) + SourceIndex(0)
-4 >Emitted(20, 25) Source(8, 25) + SourceIndex(0)
+1->Emitted(21, 13) Source(8, 13) + SourceIndex(0)
+2 >Emitted(21, 18) Source(8, 18) + SourceIndex(0)
+3 >Emitted(21, 20) Source(8, 20) + SourceIndex(0)
+4 >Emitted(21, 25) Source(8, 25) + SourceIndex(0)
 ---
 >>>            foo: function () {
 1->^^^^^^^^^^^^
@@ -100,8 +101,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->,
   >            
 2 >            foo
-1->Emitted(21, 13) Source(9, 13) + SourceIndex(0)
-2 >Emitted(21, 16) Source(9, 16) + SourceIndex(0)
+1->Emitted(22, 13) Source(9, 13) + SourceIndex(0)
+2 >Emitted(22, 16) Source(9, 16) + SourceIndex(0)
 ---
 >>>                return "well this looks kinda C-ish.";
 1->^^^^^^^^^^^^^^^^
@@ -113,10 +114,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >                return 
 3 >                       "well this looks kinda C-ish."
 4 >                                                     ;
-1->Emitted(22, 17) Source(10, 17) + SourceIndex(0)
-2 >Emitted(22, 24) Source(10, 24) + SourceIndex(0)
-3 >Emitted(22, 54) Source(10, 54) + SourceIndex(0)
-4 >Emitted(22, 55) Source(10, 55) + SourceIndex(0)
+1->Emitted(23, 17) Source(10, 17) + SourceIndex(0)
+2 >Emitted(23, 24) Source(10, 24) + SourceIndex(0)
+3 >Emitted(23, 54) Source(10, 54) + SourceIndex(0)
+4 >Emitted(23, 55) Source(10, 55) + SourceIndex(0)
 ---
 >>>            }
 1 >^^^^^^^^^^^^
@@ -124,8 +125,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            
 2 >            }
-1 >Emitted(23, 13) Source(11, 13) + SourceIndex(0)
-2 >Emitted(23, 14) Source(11, 14) + SourceIndex(0)
+1 >Emitted(24, 13) Source(11, 13) + SourceIndex(0)
+2 >Emitted(24, 14) Source(11, 14) + SourceIndex(0)
 ---
 >>>        };
 1 >^^^^^^^^^
@@ -133,8 +134,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >        }
 2 >         
-1 >Emitted(24, 10) Source(12, 10) + SourceIndex(0)
-2 >Emitted(24, 11) Source(12, 10) + SourceIndex(0)
+1 >Emitted(25, 10) Source(12, 10) + SourceIndex(0)
+2 >Emitted(25, 11) Source(12, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -143,8 +144,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >    
 2 >    }
-1 >Emitted(25, 5) Source(13, 5) + SourceIndex(0)
-2 >Emitted(25, 6) Source(13, 6) + SourceIndex(0)
+1 >Emitted(26, 5) Source(13, 5) + SourceIndex(0)
+2 >Emitted(26, 6) Source(13, 6) + SourceIndex(0)
 ---
 >>>    C.prototype.foo = function () { return "this never gets used."; };
 1->^^^^
@@ -165,15 +166,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                                                                  ;
 8 >                                                                    
 9 >                                                                    }
-1->Emitted(26, 5) Source(4, 5) + SourceIndex(0)
-2 >Emitted(26, 20) Source(4, 8) + SourceIndex(0)
-3 >Emitted(26, 23) Source(4, 5) + SourceIndex(0)
-4 >Emitted(26, 37) Source(4, 13) + SourceIndex(0)
-5 >Emitted(26, 44) Source(4, 20) + SourceIndex(0)
-6 >Emitted(26, 67) Source(4, 43) + SourceIndex(0)
-7 >Emitted(26, 68) Source(4, 44) + SourceIndex(0)
-8 >Emitted(26, 69) Source(4, 45) + SourceIndex(0)
-9 >Emitted(26, 70) Source(4, 46) + SourceIndex(0)
+1->Emitted(27, 5) Source(4, 5) + SourceIndex(0)
+2 >Emitted(27, 20) Source(4, 8) + SourceIndex(0)
+3 >Emitted(27, 23) Source(4, 5) + SourceIndex(0)
+4 >Emitted(27, 37) Source(4, 13) + SourceIndex(0)
+5 >Emitted(27, 44) Source(4, 20) + SourceIndex(0)
+6 >Emitted(27, 67) Source(4, 43) + SourceIndex(0)
+7 >Emitted(27, 68) Source(4, 44) + SourceIndex(0)
+8 >Emitted(27, 69) Source(4, 45) + SourceIndex(0)
+9 >Emitted(27, 70) Source(4, 46) + SourceIndex(0)
 ---
 >>>    return C;
 1 >^^^^
@@ -190,8 +191,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    }
   >
 2 >    }
-1 >Emitted(27, 5) Source(14, 1) + SourceIndex(0)
-2 >Emitted(27, 13) Source(14, 2) + SourceIndex(0)
+1 >Emitted(28, 5) Source(14, 1) + SourceIndex(0)
+2 >Emitted(28, 13) Source(14, 2) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -216,10 +217,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >         }
   >     }
   > }
-1 >Emitted(28, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(28, 2) Source(14, 2) + SourceIndex(0)
-3 >Emitted(28, 2) Source(1, 1) + SourceIndex(0)
-4 >Emitted(28, 6) Source(14, 2) + SourceIndex(0)
+1 >Emitted(29, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(29, 2) Source(14, 2) + SourceIndex(0)
+3 >Emitted(29, 2) Source(1, 1) + SourceIndex(0)
+4 >Emitted(29, 6) Source(14, 2) + SourceIndex(0)
 ---
 >>>var D = /** @class */ (function (_super) {
 1->
@@ -227,15 +228,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->
   >
   >
-1->Emitted(29, 1) Source(16, 1) + SourceIndex(0)
+1->Emitted(30, 1) Source(16, 1) + SourceIndex(0)
 ---
 >>>    __extends(D, _super);
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^
 1->class D extends 
 2 >    C
-1->Emitted(30, 5) Source(16, 17) + SourceIndex(0)
-2 >Emitted(30, 26) Source(16, 18) + SourceIndex(0)
+1->Emitted(31, 5) Source(16, 17) + SourceIndex(0)
+2 >Emitted(31, 26) Source(16, 18) + SourceIndex(0)
 ---
 >>>    function D(a) {
 1 >^^^^
@@ -248,9 +249,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >    
 2 >    constructor(
 3 >               a = 100
-1 >Emitted(31, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(31, 16) Source(19, 17) + SourceIndex(0)
-3 >Emitted(31, 17) Source(19, 24) + SourceIndex(0)
+1 >Emitted(32, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(32, 16) Source(19, 17) + SourceIndex(0)
+3 >Emitted(32, 17) Source(19, 24) + SourceIndex(0)
 ---
 >>>        if (a === void 0) { a = 100; }
 1->^^^^^^^^
@@ -262,10 +263,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >        
 3 >                          
 4 >                            a = 100
-1->Emitted(32, 9) Source(19, 17) + SourceIndex(0)
-2 >Emitted(32, 27) Source(19, 17) + SourceIndex(0)
-3 >Emitted(32, 29) Source(19, 17) + SourceIndex(0)
-4 >Emitted(32, 36) Source(19, 24) + SourceIndex(0)
+1->Emitted(33, 9) Source(19, 17) + SourceIndex(0)
+2 >Emitted(33, 27) Source(19, 17) + SourceIndex(0)
+3 >Emitted(33, 29) Source(19, 17) + SourceIndex(0)
+4 >Emitted(33, 36) Source(19, 24) + SourceIndex(0)
 ---
 >>>        var _this = _super.call(this, a) || this;
 1->^^^^^^^^
@@ -294,12 +295,12 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >                                                else
   >                                                    return null;
   >                                            }
-1->Emitted(33, 9) Source(19, 5) + SourceIndex(0)
-2 >Emitted(33, 21) Source(20, 9) + SourceIndex(0)
-3 >Emitted(33, 39) Source(20, 15) + SourceIndex(0)
-4 >Emitted(33, 40) Source(20, 16) + SourceIndex(0)
-5 >Emitted(33, 41) Source(20, 17) + SourceIndex(0)
-6 >Emitted(33, 50) Source(32, 6) + SourceIndex(0)
+1->Emitted(34, 9) Source(19, 5) + SourceIndex(0)
+2 >Emitted(34, 21) Source(20, 9) + SourceIndex(0)
+3 >Emitted(34, 39) Source(20, 15) + SourceIndex(0)
+4 >Emitted(34, 40) Source(20, 16) + SourceIndex(0)
+5 >Emitted(34, 41) Source(20, 17) + SourceIndex(0)
+6 >Emitted(34, 50) Source(32, 6) + SourceIndex(0)
 ---
 >>>        _this.dProp = function () { return _this; };
 1->^^^^^^^^
@@ -320,15 +321,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                                                
 8 >                                                  this
 9 >                                                   ;
-1->Emitted(34, 9) Source(17, 5) + SourceIndex(0)
-2 >Emitted(34, 20) Source(17, 10) + SourceIndex(0)
-3 >Emitted(34, 23) Source(17, 13) + SourceIndex(0)
-4 >Emitted(34, 37) Source(17, 19) + SourceIndex(0)
-5 >Emitted(34, 44) Source(17, 19) + SourceIndex(0)
-6 >Emitted(34, 49) Source(17, 23) + SourceIndex(0)
-7 >Emitted(34, 51) Source(17, 19) + SourceIndex(0)
-8 >Emitted(34, 52) Source(17, 23) + SourceIndex(0)
-9 >Emitted(34, 53) Source(17, 24) + SourceIndex(0)
+1->Emitted(35, 9) Source(17, 5) + SourceIndex(0)
+2 >Emitted(35, 20) Source(17, 10) + SourceIndex(0)
+3 >Emitted(35, 23) Source(17, 13) + SourceIndex(0)
+4 >Emitted(35, 37) Source(17, 19) + SourceIndex(0)
+5 >Emitted(35, 44) Source(17, 19) + SourceIndex(0)
+6 >Emitted(35, 49) Source(17, 23) + SourceIndex(0)
+7 >Emitted(35, 51) Source(17, 19) + SourceIndex(0)
+8 >Emitted(35, 52) Source(17, 23) + SourceIndex(0)
+9 >Emitted(35, 53) Source(17, 24) + SourceIndex(0)
 ---
 >>>        if (Math.random() < 0.5) {
 1 >^^^^^^^^
@@ -354,15 +355,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 7 >                          < 
 8 >                            0.5
 9 >                               ) 
-1 >Emitted(35, 9) Source(22, 9) + SourceIndex(0)
-2 >Emitted(35, 13) Source(22, 13) + SourceIndex(0)
-3 >Emitted(35, 17) Source(22, 17) + SourceIndex(0)
-4 >Emitted(35, 18) Source(22, 18) + SourceIndex(0)
-5 >Emitted(35, 24) Source(22, 24) + SourceIndex(0)
-6 >Emitted(35, 26) Source(22, 26) + SourceIndex(0)
-7 >Emitted(35, 29) Source(22, 29) + SourceIndex(0)
-8 >Emitted(35, 32) Source(22, 32) + SourceIndex(0)
-9 >Emitted(35, 34) Source(22, 34) + SourceIndex(0)
+1 >Emitted(36, 9) Source(22, 9) + SourceIndex(0)
+2 >Emitted(36, 13) Source(22, 13) + SourceIndex(0)
+3 >Emitted(36, 17) Source(22, 17) + SourceIndex(0)
+4 >Emitted(36, 18) Source(22, 18) + SourceIndex(0)
+5 >Emitted(36, 24) Source(22, 24) + SourceIndex(0)
+6 >Emitted(36, 26) Source(22, 26) + SourceIndex(0)
+7 >Emitted(36, 29) Source(22, 29) + SourceIndex(0)
+8 >Emitted(36, 32) Source(22, 32) + SourceIndex(0)
+9 >Emitted(36, 34) Source(22, 34) + SourceIndex(0)
 ---
 >>>            "You win!";
 1 >^^^^^^^^^^^^
@@ -372,9 +373,9 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >            
 2 >            "You win!"
 3 >                      
-1 >Emitted(36, 13) Source(23, 13) + SourceIndex(0)
-2 >Emitted(36, 23) Source(23, 23) + SourceIndex(0)
-3 >Emitted(36, 24) Source(23, 23) + SourceIndex(0)
+1 >Emitted(37, 13) Source(23, 13) + SourceIndex(0)
+2 >Emitted(37, 23) Source(23, 23) + SourceIndex(0)
+3 >Emitted(37, 24) Source(23, 23) + SourceIndex(0)
 ---
 >>>            return {
 1 >^^^^^^^^^^^^
@@ -383,8 +384,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            
 2 >            return 
-1 >Emitted(37, 13) Source(24, 13) + SourceIndex(0)
-2 >Emitted(37, 20) Source(24, 20) + SourceIndex(0)
+1 >Emitted(38, 13) Source(24, 13) + SourceIndex(0)
+2 >Emitted(38, 20) Source(24, 20) + SourceIndex(0)
 ---
 >>>                cProp: 1,
 1->^^^^^^^^^^^^^^^^
@@ -397,10 +398,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >                cProp
 3 >                     : 
 4 >                       1
-1->Emitted(38, 17) Source(25, 17) + SourceIndex(0)
-2 >Emitted(38, 22) Source(25, 22) + SourceIndex(0)
-3 >Emitted(38, 24) Source(25, 24) + SourceIndex(0)
-4 >Emitted(38, 25) Source(25, 25) + SourceIndex(0)
+1->Emitted(39, 17) Source(25, 17) + SourceIndex(0)
+2 >Emitted(39, 22) Source(25, 22) + SourceIndex(0)
+3 >Emitted(39, 24) Source(25, 24) + SourceIndex(0)
+4 >Emitted(39, 25) Source(25, 25) + SourceIndex(0)
 ---
 >>>                dProp: function () { return _this; },
 1->^^^^^^^^^^^^^^^^
@@ -421,14 +422,14 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 6 >                                            this
 7 >                                                 
 8 >                                                   this
-1->Emitted(39, 17) Source(26, 17) + SourceIndex(0)
-2 >Emitted(39, 22) Source(26, 22) + SourceIndex(0)
-3 >Emitted(39, 24) Source(26, 24) + SourceIndex(0)
-4 >Emitted(39, 38) Source(26, 30) + SourceIndex(0)
-5 >Emitted(39, 45) Source(26, 30) + SourceIndex(0)
-6 >Emitted(39, 50) Source(26, 34) + SourceIndex(0)
-7 >Emitted(39, 52) Source(26, 30) + SourceIndex(0)
-8 >Emitted(39, 53) Source(26, 34) + SourceIndex(0)
+1->Emitted(40, 17) Source(26, 17) + SourceIndex(0)
+2 >Emitted(40, 22) Source(26, 22) + SourceIndex(0)
+3 >Emitted(40, 24) Source(26, 24) + SourceIndex(0)
+4 >Emitted(40, 38) Source(26, 30) + SourceIndex(0)
+5 >Emitted(40, 45) Source(26, 30) + SourceIndex(0)
+6 >Emitted(40, 50) Source(26, 34) + SourceIndex(0)
+7 >Emitted(40, 52) Source(26, 30) + SourceIndex(0)
+8 >Emitted(40, 53) Source(26, 34) + SourceIndex(0)
 ---
 >>>                foo: function () { return "You win!!!!!"; }
 1->^^^^^^^^^^^^^^^^
@@ -448,14 +449,14 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 6 >                                                        
 7 >                                                          
 8 >                                                          }
-1->Emitted(40, 17) Source(27, 17) + SourceIndex(0)
-2 >Emitted(40, 20) Source(27, 20) + SourceIndex(0)
-3 >Emitted(40, 36) Source(27, 25) + SourceIndex(0)
-4 >Emitted(40, 43) Source(27, 32) + SourceIndex(0)
-5 >Emitted(40, 57) Source(27, 46) + SourceIndex(0)
-6 >Emitted(40, 58) Source(27, 46) + SourceIndex(0)
-7 >Emitted(40, 59) Source(27, 47) + SourceIndex(0)
-8 >Emitted(40, 60) Source(27, 48) + SourceIndex(0)
+1->Emitted(41, 17) Source(27, 17) + SourceIndex(0)
+2 >Emitted(41, 20) Source(27, 20) + SourceIndex(0)
+3 >Emitted(41, 36) Source(27, 25) + SourceIndex(0)
+4 >Emitted(41, 43) Source(27, 32) + SourceIndex(0)
+5 >Emitted(41, 57) Source(27, 46) + SourceIndex(0)
+6 >Emitted(41, 58) Source(27, 46) + SourceIndex(0)
+7 >Emitted(41, 59) Source(27, 47) + SourceIndex(0)
+8 >Emitted(41, 60) Source(27, 48) + SourceIndex(0)
 ---
 >>>            };
 1 >^^^^^^^^^^^^^
@@ -463,15 +464,15 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >            }
 2 >             ;
-1 >Emitted(41, 14) Source(28, 14) + SourceIndex(0)
-2 >Emitted(41, 15) Source(28, 15) + SourceIndex(0)
+1 >Emitted(42, 14) Source(28, 14) + SourceIndex(0)
+2 >Emitted(42, 15) Source(28, 15) + SourceIndex(0)
 ---
 >>>        }
 1 >^^^^^^^^^
 2 >         ^^^^->
 1 >
   >        }
-1 >Emitted(42, 10) Source(29, 10) + SourceIndex(0)
+1 >Emitted(43, 10) Source(29, 10) + SourceIndex(0)
 ---
 >>>        else
 >>>            return null;
@@ -485,10 +486,10 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 2 >            return 
 3 >                   null
 4 >                       ;
-1->Emitted(44, 13) Source(31, 13) + SourceIndex(0)
-2 >Emitted(44, 20) Source(31, 20) + SourceIndex(0)
-3 >Emitted(44, 24) Source(31, 24) + SourceIndex(0)
-4 >Emitted(44, 25) Source(31, 25) + SourceIndex(0)
+1->Emitted(45, 13) Source(31, 13) + SourceIndex(0)
+2 >Emitted(45, 20) Source(31, 20) + SourceIndex(0)
+3 >Emitted(45, 24) Source(31, 24) + SourceIndex(0)
+4 >Emitted(45, 25) Source(31, 25) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -497,8 +498,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1 >
   >    
 2 >    }
-1 >Emitted(45, 5) Source(32, 5) + SourceIndex(0)
-2 >Emitted(45, 6) Source(32, 6) + SourceIndex(0)
+1 >Emitted(46, 5) Source(32, 5) + SourceIndex(0)
+2 >Emitted(46, 6) Source(32, 6) + SourceIndex(0)
 ---
 >>>    return D;
 1->^^^^
@@ -506,8 +507,8 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 1->
   >
 2 >    }
-1->Emitted(46, 5) Source(33, 1) + SourceIndex(0)
-2 >Emitted(46, 13) Source(33, 2) + SourceIndex(0)
+1->Emitted(47, 5) Source(33, 1) + SourceIndex(0)
+2 >Emitted(47, 13) Source(33, 2) + SourceIndex(0)
 ---
 >>>}(C));
 1 >
@@ -540,11 +541,11 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
   >               return null;
   >       }
   >   }
-1 >Emitted(47, 1) Source(33, 1) + SourceIndex(0)
-2 >Emitted(47, 2) Source(33, 2) + SourceIndex(0)
-3 >Emitted(47, 2) Source(16, 1) + SourceIndex(0)
-4 >Emitted(47, 3) Source(16, 17) + SourceIndex(0)
-5 >Emitted(47, 4) Source(16, 18) + SourceIndex(0)
-6 >Emitted(47, 7) Source(33, 2) + SourceIndex(0)
+1 >Emitted(48, 1) Source(33, 1) + SourceIndex(0)
+2 >Emitted(48, 2) Source(33, 2) + SourceIndex(0)
+3 >Emitted(48, 2) Source(16, 1) + SourceIndex(0)
+4 >Emitted(48, 3) Source(16, 17) + SourceIndex(0)
+5 >Emitted(48, 4) Source(16, 18) + SourceIndex(0)
+6 >Emitted(48, 7) Source(33, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=derivedClassConstructorWithExplicitReturns01.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
index a2e5ea9af03..0442aaf8911 100644
--- a/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
+++ b/tests/baselines/reference/derivedClassConstructorWithoutSuperCall.js
@@ -42,8 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js b/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
index bf7d6631025..8394b689589 100644
--- a/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
+++ b/tests/baselines/reference/derivedClassFunctionOverridesBaseClassAccessor.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
index 76efe551df5..79922c29bbb 100644
--- a/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
+++ b/tests/baselines/reference/derivedClassIncludesInheritedMembers.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
index 35107d1da2c..2dc09fab050 100644
--- a/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
+++ b/tests/baselines/reference/derivedClassOverridesIndexersWithAssignmentCompatibility.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js b/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
index 5378e342fd4..d098bbdb490 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivateFunction1.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassOverridesPrivates.js b/tests/baselines/reference/derivedClassOverridesPrivates.js
index a080cbacce2..bfdd788f4de 100644
--- a/tests/baselines/reference/derivedClassOverridesPrivates.js
+++ b/tests/baselines/reference/derivedClassOverridesPrivates.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
index 62b14797332..c9db50fe9ac 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
@@ -44,8 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
index a2b271f82ff..8874eb394d0 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
@@ -72,8 +72,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
index fed9b4cf03d..aee578cbc60 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
@@ -79,8 +79,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
index 9562bd9edc2..f7f18d97f4d 100644
--- a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
+++ b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassOverridesPublicMembers.js b/tests/baselines/reference/derivedClassOverridesPublicMembers.js
index 02a2be56a5d..1595028eab3 100644
--- a/tests/baselines/reference/derivedClassOverridesPublicMembers.js
+++ b/tests/baselines/reference/derivedClassOverridesPublicMembers.js
@@ -71,8 +71,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
index 2964dfd637b..b65ee3a90e6 100644
--- a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
+++ b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassParameterProperties.js b/tests/baselines/reference/derivedClassParameterProperties.js
index 7be320920c2..46aecf42832 100644
--- a/tests/baselines/reference/derivedClassParameterProperties.js
+++ b/tests/baselines/reference/derivedClassParameterProperties.js
@@ -104,8 +104,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
index df42d2c22b4..38a49bdb3fe 100644
--- a/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
+++ b/tests/baselines/reference/derivedClassSuperCallsInNonConstructorMembers.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
index b2758596e01..34c814e023a 100644
--- a/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
+++ b/tests/baselines/reference/derivedClassSuperCallsWithThisArg.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassTransitivity.js b/tests/baselines/reference/derivedClassTransitivity.js
index cb585761429..2b706a3a395 100644
--- a/tests/baselines/reference/derivedClassTransitivity.js
+++ b/tests/baselines/reference/derivedClassTransitivity.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassTransitivity2.js b/tests/baselines/reference/derivedClassTransitivity2.js
index 84c0bd24ee0..f2da0b4b077 100644
--- a/tests/baselines/reference/derivedClassTransitivity2.js
+++ b/tests/baselines/reference/derivedClassTransitivity2.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassTransitivity3.js b/tests/baselines/reference/derivedClassTransitivity3.js
index 24512be746e..9e7eee5b13d 100644
--- a/tests/baselines/reference/derivedClassTransitivity3.js
+++ b/tests/baselines/reference/derivedClassTransitivity3.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassTransitivity4.js b/tests/baselines/reference/derivedClassTransitivity4.js
index 9ce924abfa4..504db3a6197 100644
--- a/tests/baselines/reference/derivedClassTransitivity4.js
+++ b/tests/baselines/reference/derivedClassTransitivity4.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassWithAny.js b/tests/baselines/reference/derivedClassWithAny.js
index eee9fc871c1..08bbf88c1cd 100644
--- a/tests/baselines/reference/derivedClassWithAny.js
+++ b/tests/baselines/reference/derivedClassWithAny.js
@@ -68,8 +68,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
index 03cf53e5ee5..28fa8c1ac35 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingProtectedInstance.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
index 6b70dd68b00..d17bed39ec0 100644
--- a/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
+++ b/tests/baselines/reference/derivedClassWithPrivateInstanceShadowingPublicInstance.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
index 59434074d67..255623d51c4 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingProtectedStatic.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
index 1609efab14f..fd0a171d499 100644
--- a/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
+++ b/tests/baselines/reference/derivedClassWithPrivateStaticShadowingPublicStatic.js
@@ -42,8 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
index 53750feade6..c014ac9eb73 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
index ca329e46504..26c593bd39b 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor2.js
@@ -42,8 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
index 88d6856e214..e037862cbb4 100644
--- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
+++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js
@@ -56,8 +56,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedClasses.js b/tests/baselines/reference/derivedClasses.js
index b416a4f4980..dd683cb066b 100644
--- a/tests/baselines/reference/derivedClasses.js
+++ b/tests/baselines/reference/derivedClasses.js
@@ -39,8 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedGenericClassWithAny.js b/tests/baselines/reference/derivedGenericClassWithAny.js
index c0cc36e4ad5..c8d57a9f13a 100644
--- a/tests/baselines/reference/derivedGenericClassWithAny.js
+++ b/tests/baselines/reference/derivedGenericClassWithAny.js
@@ -51,8 +51,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
index f59f10f4612..ad17cf35af8 100644
--- a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
+++ b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
index a8347b040f6..8fc7af93c9c 100644
--- a/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
+++ b/tests/baselines/reference/derivedTypeDoesNotRequireExtendsClause.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js b/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
index 384abc71306..b3967c88377 100644
--- a/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
+++ b/tests/baselines/reference/derivedUninitializedPropertyDeclaration.js
@@ -92,8 +92,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/destructuringParameterDeclaration5.js b/tests/baselines/reference/destructuringParameterDeclaration5.js
index 80243d163c5..6fa2fb6666e 100644
--- a/tests/baselines/reference/destructuringParameterDeclaration5.js
+++ b/tests/baselines/reference/destructuringParameterDeclaration5.js
@@ -60,8 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js b/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
index ee9655f3709..cf7aa47ef55 100644
--- a/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
+++ b/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitBundleWithPrologueDirectives1.js b/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
index a6d020138d9..d44fe6c6c6f 100644
--- a/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
+++ b/tests/baselines/reference/emitBundleWithPrologueDirectives1.js
@@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitBundleWithShebang1.js b/tests/baselines/reference/emitBundleWithShebang1.js
index 36060ceb523..444833aa7ab 100644
--- a/tests/baselines/reference/emitBundleWithShebang1.js
+++ b/tests/baselines/reference/emitBundleWithShebang1.js
@@ -13,8 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitBundleWithShebang2.js b/tests/baselines/reference/emitBundleWithShebang2.js
index 11403472ef9..c2808ec4217 100644
--- a/tests/baselines/reference/emitBundleWithShebang2.js
+++ b/tests/baselines/reference/emitBundleWithShebang2.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
index 0811d4f1bf2..d423664c32c 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.js
@@ -15,8 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
index 53d1ee88480..f092a6bc426 100644
--- a/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js b/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
index 0f6b043b2c2..0b4df59fb1f 100644
--- a/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
+++ b/tests/baselines/reference/emitClassDeclarationWithPropertyAccessInHeritageClause1.js
@@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitClassExpressionInDeclarationFile.js b/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
index b40dce9e199..61c823d57fc 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js b/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
index 89dddd7bfec..12e5b71a113 100644
--- a/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
+++ b/tests/baselines/reference/emitClassExpressionInDeclarationFile2.js
@@ -39,8 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
index 03149434bd2..3d3d5431c05 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitParameterPropertyDeclaration1.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
index da2daf8dcb2..47581e1937d 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclaration1.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
index 54ebb7d8580..f31339e38af 100644
--- a/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
+++ b/tests/baselines/reference/emitSuperCallBeforeEmitPropertyDeclarationAndParameterPropertyDeclaration1.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitThisInSuperMethodCall.js b/tests/baselines/reference/emitThisInSuperMethodCall.js
index bb2fa76fc0c..e91b339e6d3 100644
--- a/tests/baselines/reference/emitThisInSuperMethodCall.js
+++ b/tests/baselines/reference/emitThisInSuperMethodCall.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
index 790cd930e6b..05ac3119e17 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
@@ -579,8 +579,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js
index e74d04a633e..c9823bfaa55 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -13,8 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
index 031a88dbb87..9edd01767fb 100644
--- a/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
+++ b/tests/baselines/reference/errorForwardReferenceForwadingConstructor.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/errorSuperCalls.js b/tests/baselines/reference/errorSuperCalls.js
index 2b8177adb6a..8610f95e0a8 100644
--- a/tests/baselines/reference/errorSuperCalls.js
+++ b/tests/baselines/reference/errorSuperCalls.js
@@ -83,8 +83,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/errorSuperPropertyAccess.js b/tests/baselines/reference/errorSuperPropertyAccess.js
index e609f86ca7c..a33ff30d328 100644
--- a/tests/baselines/reference/errorSuperPropertyAccess.js
+++ b/tests/baselines/reference/errorSuperPropertyAccess.js
@@ -137,8 +137,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/errorsInGenericTypeReference.js b/tests/baselines/reference/errorsInGenericTypeReference.js
index ea1ec3d125e..002bb48ded6 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.js
+++ b/tests/baselines/reference/errorsInGenericTypeReference.js
@@ -80,8 +80,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/es6ClassSuperCodegenBug.js b/tests/baselines/reference/es6ClassSuperCodegenBug.js
index f4d31aa1391..f5a6bfc1d4d 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.js
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/es6ClassTest.js b/tests/baselines/reference/es6ClassTest.js
index e14a73e6926..2114d5b6f66 100644
--- a/tests/baselines/reference/es6ClassTest.js
+++ b/tests/baselines/reference/es6ClassTest.js
@@ -93,8 +93,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/es6ClassTest2.js b/tests/baselines/reference/es6ClassTest2.js
index 6e90fcbfedd..82bdeec82ae 100644
--- a/tests/baselines/reference/es6ClassTest2.js
+++ b/tests/baselines/reference/es6ClassTest2.js
@@ -167,8 +167,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/es6ClassTest7.js b/tests/baselines/reference/es6ClassTest7.js
index 1932f6f2de6..fa9d38908a0 100644
--- a/tests/baselines/reference/es6ClassTest7.js
+++ b/tests/baselines/reference/es6ClassTest7.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js
index 0256aa3baae..c93f9f6bcba 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/exportClassExtendingIntersection.js b/tests/baselines/reference/exportClassExtendingIntersection.js
index 8b795bc1ea6..a610a625d3d 100644
--- a/tests/baselines/reference/exportClassExtendingIntersection.js
+++ b/tests/baselines/reference/exportClassExtendingIntersection.js
@@ -55,8 +55,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -84,8 +85,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/exportDeclarationInInternalModule.js b/tests/baselines/reference/exportDeclarationInInternalModule.js
index 6cb95e2795b..b35a297f9ae 100644
--- a/tests/baselines/reference/exportDeclarationInInternalModule.js
+++ b/tests/baselines/reference/exportDeclarationInInternalModule.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/exportDefaultAbstractClass.js b/tests/baselines/reference/exportDefaultAbstractClass.js
index b01d17c97df..de04b0eee54 100644
--- a/tests/baselines/reference/exportDefaultAbstractClass.js
+++ b/tests/baselines/reference/exportDefaultAbstractClass.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -54,8 +55,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extBaseClass1.js b/tests/baselines/reference/extBaseClass1.js
index f80d7f4deaa..2a131e2ac04 100644
--- a/tests/baselines/reference/extBaseClass1.js
+++ b/tests/baselines/reference/extBaseClass1.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extBaseClass2.js b/tests/baselines/reference/extBaseClass2.js
index 7dc1ca88ab5..87ce7bc8778 100644
--- a/tests/baselines/reference/extBaseClass2.js
+++ b/tests/baselines/reference/extBaseClass2.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType.js b/tests/baselines/reference/extendAndImplementTheSameBaseType.js
index 7676baef571..67c63726580 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
index 63f4aea8fe7..c0bba1d8980 100644
--- a/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
+++ b/tests/baselines/reference/extendAndImplementTheSameBaseType2.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
index 94d61954405..14f79f4a0f7 100644
--- a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
+++ b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.js
@@ -12,8 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js
index e8bd0ecaffa..99d8156784b 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendConstructSignatureInInterface.js b/tests/baselines/reference/extendConstructSignatureInInterface.js
index 4d3cc5053be..2881f233649 100644
--- a/tests/baselines/reference/extendConstructSignatureInInterface.js
+++ b/tests/baselines/reference/extendConstructSignatureInInterface.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendFromAny.js b/tests/baselines/reference/extendFromAny.js
index e2ee1bca709..96559b8bf23 100644
--- a/tests/baselines/reference/extendFromAny.js
+++ b/tests/baselines/reference/extendFromAny.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendNonClassSymbol1.js b/tests/baselines/reference/extendNonClassSymbol1.js
index b310e48685d..80118ec8d08 100644
--- a/tests/baselines/reference/extendNonClassSymbol1.js
+++ b/tests/baselines/reference/extendNonClassSymbol1.js
@@ -12,8 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendNonClassSymbol2.js b/tests/baselines/reference/extendNonClassSymbol2.js
index 82bfe35d586..de1f20636a9 100644
--- a/tests/baselines/reference/extendNonClassSymbol2.js
+++ b/tests/baselines/reference/extendNonClassSymbol2.js
@@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendPrivateConstructorClass.js b/tests/baselines/reference/extendPrivateConstructorClass.js
index 678e85d270a..86126a9c3e2 100644
--- a/tests/baselines/reference/extendPrivateConstructorClass.js
+++ b/tests/baselines/reference/extendPrivateConstructorClass.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
index d431051fe6d..3126b860342 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -52,8 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -80,8 +81,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendsClause.js b/tests/baselines/reference/extendsClause.js
index d7da659f1b2..5a3ff7e44f2 100644
--- a/tests/baselines/reference/extendsClause.js
+++ b/tests/baselines/reference/extendsClause.js
@@ -44,8 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendsClauseAlreadySeen.js b/tests/baselines/reference/extendsClauseAlreadySeen.js
index e7bc3cf0930..3a0fe12fe6a 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen.js
@@ -15,8 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendsClauseAlreadySeen2.js b/tests/baselines/reference/extendsClauseAlreadySeen2.js
index 260bb6d4bd5..da112e48983 100644
--- a/tests/baselines/reference/extendsClauseAlreadySeen2.js
+++ b/tests/baselines/reference/extendsClauseAlreadySeen2.js
@@ -15,8 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/extendsUntypedModule.js b/tests/baselines/reference/extendsUntypedModule.js
index ea378ae1298..5284a2e9a74 100644
--- a/tests/baselines/reference/extendsUntypedModule.js
+++ b/tests/baselines/reference/extendsUntypedModule.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/fluentClasses.js b/tests/baselines/reference/fluentClasses.js
index 2e36ae9dace..859ad1a3975 100644
--- a/tests/baselines/reference/fluentClasses.js
+++ b/tests/baselines/reference/fluentClasses.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/for-inStatements.js b/tests/baselines/reference/for-inStatements.js
index 55c87503639..093eaad8b40 100644
--- a/tests/baselines/reference/for-inStatements.js
+++ b/tests/baselines/reference/for-inStatements.js
@@ -89,8 +89,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/for-inStatementsInvalid.js b/tests/baselines/reference/for-inStatementsInvalid.js
index 0a863286b59..bdde889ee8c 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.js
+++ b/tests/baselines/reference/for-inStatementsInvalid.js
@@ -72,8 +72,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
index 8c492ad4b73..71b35c8cced 100644
--- a/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
+++ b/tests/baselines/reference/forStatementsMultipleInvalidDecl.js
@@ -62,8 +62,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/functionImplementationErrors.js b/tests/baselines/reference/functionImplementationErrors.js
index 5be7467c7b5..3f516cbd55b 100644
--- a/tests/baselines/reference/functionImplementationErrors.js
+++ b/tests/baselines/reference/functionImplementationErrors.js
@@ -82,8 +82,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/functionImplementations.js b/tests/baselines/reference/functionImplementations.js
index dba72fff13a..1b116bc2fa6 100644
--- a/tests/baselines/reference/functionImplementations.js
+++ b/tests/baselines/reference/functionImplementations.js
@@ -165,8 +165,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/functionSubtypingOfVarArgs.js b/tests/baselines/reference/functionSubtypingOfVarArgs.js
index 1e7b5d0a79b..decf4f4eaa9 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/functionSubtypingOfVarArgs2.js b/tests/baselines/reference/functionSubtypingOfVarArgs2.js
index 53b66ff6a84..920cae18c83 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs2.js
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs2.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/generatedContextualTyping.js b/tests/baselines/reference/generatedContextualTyping.js
index 28c292c318d..acb1b0f320f 100644
--- a/tests/baselines/reference/generatedContextualTyping.js
+++ b/tests/baselines/reference/generatedContextualTyping.js
@@ -363,8 +363,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty.js b/tests/baselines/reference/genericBaseClassLiteralProperty.js
index f198c9c7f00..fce1e33177e 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty2.js b/tests/baselines/reference/genericBaseClassLiteralProperty2.js
index 3f62dde8cce..a66374608a5 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty2.js
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
index b4433d63bfb..23f2f4b0410 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.js
@@ -117,8 +117,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
index 4bb0e685a43..d5a36344ea6 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
index 3d23afda8ae..d0e74ec1bff 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
index 95c6011e5cf..3b0256a25c8 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints3.js
@@ -47,8 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
index 9cde80d5ee3..fab42865555 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericClassExpressionInFunction.js b/tests/baselines/reference/genericClassExpressionInFunction.js
index 0b9514867c2..54861fd3fbf 100644
--- a/tests/baselines/reference/genericClassExpressionInFunction.js
+++ b/tests/baselines/reference/genericClassExpressionInFunction.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
index abe892cda53..90a0c0098b9 100644
--- a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
+++ b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.js
@@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
index bc5e1371ee8..247e88490a0 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.js
@@ -84,8 +84,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericClassStaticMethod.js b/tests/baselines/reference/genericClassStaticMethod.js
index 47707cd8b94..65c7603d5f8 100644
--- a/tests/baselines/reference/genericClassStaticMethod.js
+++ b/tests/baselines/reference/genericClassStaticMethod.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericClasses3.js b/tests/baselines/reference/genericClasses3.js
index d97630ae1b9..e70b7d84721 100644
--- a/tests/baselines/reference/genericClasses3.js
+++ b/tests/baselines/reference/genericClasses3.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
index 6d504ce0fe0..8412efa8091 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
index 7506bbc2d1f..96af28b411e 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
index 5fccd8e717b..59fb2d8ccc0 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
index 7408a8ff174..42c00f9f8bb 100644
--- a/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
+++ b/tests/baselines/reference/genericDerivedTypeWithSpecializedBase2.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericInheritedDefaultConstructors.js b/tests/baselines/reference/genericInheritedDefaultConstructors.js
index a3449eee10b..f643bd1524f 100644
--- a/tests/baselines/reference/genericInheritedDefaultConstructors.js
+++ b/tests/baselines/reference/genericInheritedDefaultConstructors.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericPrototypeProperty2.js b/tests/baselines/reference/genericPrototypeProperty2.js
index 284d6e2b97e..3b61fe8299d 100644
--- a/tests/baselines/reference/genericPrototypeProperty2.js
+++ b/tests/baselines/reference/genericPrototypeProperty2.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericPrototypeProperty3.js b/tests/baselines/reference/genericPrototypeProperty3.js
index 282d4c372d8..998459333fc 100644
--- a/tests/baselines/reference/genericPrototypeProperty3.js
+++ b/tests/baselines/reference/genericPrototypeProperty3.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
index a71a3c8093c..bba2d444601 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
index 7e9a8352241..b5a2e0a6588 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.js
@@ -39,8 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericTypeAssertions2.js b/tests/baselines/reference/genericTypeAssertions2.js
index 85fd402a02d..f29478f932a 100644
--- a/tests/baselines/reference/genericTypeAssertions2.js
+++ b/tests/baselines/reference/genericTypeAssertions2.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericTypeAssertions4.js b/tests/baselines/reference/genericTypeAssertions4.js
index 2c7a0726c3b..9e1f0dcea28 100644
--- a/tests/baselines/reference/genericTypeAssertions4.js
+++ b/tests/baselines/reference/genericTypeAssertions4.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericTypeAssertions6.js b/tests/baselines/reference/genericTypeAssertions6.js
index fb4b3afd4cd..c9b25616295 100644
--- a/tests/baselines/reference/genericTypeAssertions6.js
+++ b/tests/baselines/reference/genericTypeAssertions6.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericTypeConstraints.js b/tests/baselines/reference/genericTypeConstraints.js
index 4b1d266a25d..926506cb276 100644
--- a/tests/baselines/reference/genericTypeConstraints.js
+++ b/tests/baselines/reference/genericTypeConstraints.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
index baa7793c96d..8b7d96f7406 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.js
@@ -48,8 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
index ef29c54d9d6..05ce07def37 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.js
@@ -48,8 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
index 33645d6bca7..09a8b085be6 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.js b/tests/baselines/reference/heterogeneousArrayLiterals.js
index f63bc5e06a2..a9a265b1668 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.js
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.js
@@ -141,8 +141,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/ifDoWhileStatements.js b/tests/baselines/reference/ifDoWhileStatements.js
index 9ad9ab10729..2e024b6ae5f 100644
--- a/tests/baselines/reference/ifDoWhileStatements.js
+++ b/tests/baselines/reference/ifDoWhileStatements.js
@@ -171,8 +171,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/illegalSuperCallsInConstructor.js b/tests/baselines/reference/illegalSuperCallsInConstructor.js
index 5663a2e0100..8fb94fe80e8 100644
--- a/tests/baselines/reference/illegalSuperCallsInConstructor.js
+++ b/tests/baselines/reference/illegalSuperCallsInConstructor.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/implementClausePrecedingExtends.js b/tests/baselines/reference/implementClausePrecedingExtends.js
index 5ed50f28165..b3e92f279c5 100644
--- a/tests/baselines/reference/implementClausePrecedingExtends.js
+++ b/tests/baselines/reference/implementClausePrecedingExtends.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
index 34272a0a6b1..b51171c9276 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithPrivates2.js
@@ -94,8 +94,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
index 7fb2a31ff55..c2da946bc0a 100644
--- a/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
+++ b/tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.js
@@ -50,8 +50,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js
index 67aedaf329c..3986c4477c5 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js
index d37bd230082..4f2cabab68f 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -95,8 +95,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js
index e2713dd725a..eda722c3b39 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -89,8 +89,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js
index 3fb4dabb286..29fe586b316 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -69,8 +69,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/importNotElidedWhenNotFound.js b/tests/baselines/reference/importNotElidedWhenNotFound.js
index 7bf6c1b10b6..c6e650d3245 100644
--- a/tests/baselines/reference/importNotElidedWhenNotFound.js
+++ b/tests/baselines/reference/importNotElidedWhenNotFound.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/importShadowsGlobalName.js b/tests/baselines/reference/importShadowsGlobalName.js
index 3e333a8fbc7..39fdf2fb183 100644
--- a/tests/baselines/reference/importShadowsGlobalName.js
+++ b/tests/baselines/reference/importShadowsGlobalName.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index 1bcc14be47d..b3ed00c7b1f 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js b/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
index 1c857e3c376..24dde4f12e7 100644
--- a/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
+++ b/tests/baselines/reference/indexedAccessKeyofNestedSimplifiedSubstituteUnwrapped.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/indexedAccessRelation.js b/tests/baselines/reference/indexedAccessRelation.js
index 3cb1680c255..5224aa9da28 100644
--- a/tests/baselines/reference/indexedAccessRelation.js
+++ b/tests/baselines/reference/indexedAccessRelation.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/indexedAccessTypeConstraints.js b/tests/baselines/reference/indexedAccessTypeConstraints.js
index f15c3a68f4c..cfa47c66a60 100644
--- a/tests/baselines/reference/indexedAccessTypeConstraints.js
+++ b/tests/baselines/reference/indexedAccessTypeConstraints.js
@@ -46,8 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/indexerConstraints2.js b/tests/baselines/reference/indexerConstraints2.js
index d27bb46ad9a..a3553eb1f1d 100644
--- a/tests/baselines/reference/indexerConstraints2.js
+++ b/tests/baselines/reference/indexerConstraints2.js
@@ -90,8 +90,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/indirectSelfReference.js b/tests/baselines/reference/indirectSelfReference.js
index 6c8f2ea35a2..0e559acbfe2 100644
--- a/tests/baselines/reference/indirectSelfReference.js
+++ b/tests/baselines/reference/indirectSelfReference.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/indirectSelfReferenceGeneric.js b/tests/baselines/reference/indirectSelfReferenceGeneric.js
index 641febf9b10..4e1d7a3247c 100644
--- a/tests/baselines/reference/indirectSelfReferenceGeneric.js
+++ b/tests/baselines/reference/indirectSelfReferenceGeneric.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
index 3aaa275514d..79b052f3ab9 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritFromGenericTypeParameter.js b/tests/baselines/reference/inheritFromGenericTypeParameter.js
index a787b81d89c..9d3e2fab9ef 100644
--- a/tests/baselines/reference/inheritFromGenericTypeParameter.js
+++ b/tests/baselines/reference/inheritFromGenericTypeParameter.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
index 32612069ea1..4167db52554 100644
--- a/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
+++ b/tests/baselines/reference/inheritSameNamePrivatePropertiesFromSameOrigin.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritance.js b/tests/baselines/reference/inheritance.js
index a800eef15d6..12069905f8b 100644
--- a/tests/baselines/reference/inheritance.js
+++ b/tests/baselines/reference/inheritance.js
@@ -43,8 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritance1.js b/tests/baselines/reference/inheritance1.js
index 79a9fefda90..cb8593451bf 100644
--- a/tests/baselines/reference/inheritance1.js
+++ b/tests/baselines/reference/inheritance1.js
@@ -70,8 +70,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
index 0bcd4b06d5b..a3b4c4f4bee 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollision.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
index b8dba0bbc24..a6e3aeeda6b 100644
--- a/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPrivateMemberCollisionWithPublicMember.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
index 3bc790a261c..aceab2377b5 100644
--- a/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
+++ b/tests/baselines/reference/inheritanceGrandParentPublicMemberCollisionWithPrivateMember.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
index 1f2ae5b2719..570e6811867 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingAccessor.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js b/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
index 257ee1b008d..0b5df5bcea0 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingMethod.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
index 2143a8327ee..21cef954352 100644
--- a/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberAccessorOverridingProperty.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
index e1742022d15..731011b3374 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingAccessor.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
index 5a7694ab8a1..25f523fc639 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingMethod.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js b/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
index 2ccac56d603..42aad59f3b3 100644
--- a/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberFuncOverridingProperty.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js b/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
index 987b4561a20..f762a338b5d 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingAccessor.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js b/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
index 098ec8d5f59..dfda6dbc0f9 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingMethod.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
index c5d84fd6a60..5b15a34c41c 100644
--- a/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceMemberPropertyOverridingProperty.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
index 3e0b748005b..ef745a281aa 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
index 970556f0662..b2a5694f0f9 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
index 308e05dde03..f35d95365a7 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingAccessor.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
index 70fbb6ff8f3..015f571e4a6 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingMethod.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
index 4d0f4f4c747..ed4f33fcdb5 100644
--- a/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticAccessorOverridingProperty.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
index 298fe5a9bf8..7e57d9fd510 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessor.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
index 5a96756a7fe..cf7102ddbc6 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingAccessorOfFuncType.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
index 4fdd17b5905..6ac475f5f06 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js b/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
index c8f912ac9b9..21303e8e5a0 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingProperty.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
index 58830a5885b..8016a044a05 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
index 9cbc37464f5..6f287a65ea3 100644
--- a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
+++ b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticMembersCompatible.js b/tests/baselines/reference/inheritanceStaticMembersCompatible.js
index c86db6899c7..d21d81f3efb 100644
--- a/tests/baselines/reference/inheritanceStaticMembersCompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersCompatible.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticMembersIncompatible.js b/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
index bed2bdd984f..ca14c995ae1 100644
--- a/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
+++ b/tests/baselines/reference/inheritanceStaticMembersIncompatible.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
index a5e65c9ccc6..54ba35af2e4 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingAccessor.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js b/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
index 2c58bbf1567..68d2b9334e0 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingMethod.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js b/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
index 6d577ed7dfa..f4c16b35e70 100644
--- a/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
+++ b/tests/baselines/reference/inheritanceStaticPropertyOverridingProperty.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams.js b/tests/baselines/reference/inheritedConstructorWithRestParams.js
index 393c2059c5c..928e1845a2c 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritedConstructorWithRestParams2.js b/tests/baselines/reference/inheritedConstructorWithRestParams2.js
index 5c1ee2dfb46..1560f85c825 100644
--- a/tests/baselines/reference/inheritedConstructorWithRestParams2.js
+++ b/tests/baselines/reference/inheritedConstructorWithRestParams2.js
@@ -43,8 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/inheritedModuleMembersForClodule.js b/tests/baselines/reference/inheritedModuleMembersForClodule.js
index 3cda816969d..0e06d1c67f1 100644
--- a/tests/baselines/reference/inheritedModuleMembersForClodule.js
+++ b/tests/baselines/reference/inheritedModuleMembersForClodule.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/instanceOfAssignability.js b/tests/baselines/reference/instanceOfAssignability.js
index ab9565f2c39..a5a33e22457 100644
--- a/tests/baselines/reference/instanceOfAssignability.js
+++ b/tests/baselines/reference/instanceOfAssignability.js
@@ -98,8 +98,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
index 109ccf8f8b8..bfa315e0059 100644
--- a/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
+++ b/tests/baselines/reference/instancePropertiesInheritedIntoClassType.js
@@ -51,8 +51,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/instanceSubtypeCheck2.js b/tests/baselines/reference/instanceSubtypeCheck2.js
index 99304e5ef27..b19479a46b3 100644
--- a/tests/baselines/reference/instanceSubtypeCheck2.js
+++ b/tests/baselines/reference/instanceSubtypeCheck2.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
index 3ecda3001f9..66875077615 100644
--- a/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
+++ b/tests/baselines/reference/instanceofWithStructurallyIdenticalTypes.js
@@ -80,8 +80,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/instantiatedReturnTypeContravariance.js b/tests/baselines/reference/instantiatedReturnTypeContravariance.js
index 5a3a88c181a..71664cfe99e 100644
--- a/tests/baselines/reference/instantiatedReturnTypeContravariance.js
+++ b/tests/baselines/reference/instantiatedReturnTypeContravariance.js
@@ -39,8 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/interfaceClassMerging.js b/tests/baselines/reference/interfaceClassMerging.js
index bac4b82fc60..37fdaecaf88 100644
--- a/tests/baselines/reference/interfaceClassMerging.js
+++ b/tests/baselines/reference/interfaceClassMerging.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/interfaceClassMerging2.js b/tests/baselines/reference/interfaceClassMerging2.js
index 738c2410347..c8f2791736c 100644
--- a/tests/baselines/reference/interfaceClassMerging2.js
+++ b/tests/baselines/reference/interfaceClassMerging2.js
@@ -45,8 +45,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/interfaceExtendsClass1.js b/tests/baselines/reference/interfaceExtendsClass1.js
index 7dd969426aa..284f98f966a 100644
--- a/tests/baselines/reference/interfaceExtendsClass1.js
+++ b/tests/baselines/reference/interfaceExtendsClass1.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
index 15e09b94edd..01b312cdee9 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate1.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
index 15d63ab80e4..924ba1d609d 100644
--- a/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
+++ b/tests/baselines/reference/interfaceExtendsClassWithPrivate2.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/interfaceExtendsObjectIntersection.js b/tests/baselines/reference/interfaceExtendsObjectIntersection.js
index 3be49fbf1ec..92f5f6a24a0 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersection.js
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersection.js
@@ -63,8 +63,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
index bbed54436c6..8b0ed42431d 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.js
@@ -57,8 +57,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/interfaceImplementation8.js b/tests/baselines/reference/interfaceImplementation8.js
index 979526b4e13..39685c25879 100644
--- a/tests/baselines/reference/interfaceImplementation8.js
+++ b/tests/baselines/reference/interfaceImplementation8.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
index ff1e8d44224..1309e467e92 100644
--- a/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/invalidModuleWithStatementsOfEveryKind.js
@@ -88,8 +88,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/invalidMultipleVariableDeclarations.js b/tests/baselines/reference/invalidMultipleVariableDeclarations.js
index a06b6c362b7..23b4f19d74c 100644
--- a/tests/baselines/reference/invalidMultipleVariableDeclarations.js
+++ b/tests/baselines/reference/invalidMultipleVariableDeclarations.js
@@ -62,8 +62,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/invalidReturnStatements.js b/tests/baselines/reference/invalidReturnStatements.js
index b1dcfaebf9f..236612cc444 100644
--- a/tests/baselines/reference/invalidReturnStatements.js
+++ b/tests/baselines/reference/invalidReturnStatements.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index 23169b3e784..dcd0494edba 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
index 2a071228568..8ed5331e2e2 100644
--- a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
+++ b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsDeclarationsClasses.js b/tests/baselines/reference/jsDeclarationsClasses.js
index 941cada6a10..dfb3551fe0c 100644
--- a/tests/baselines/reference/jsDeclarationsClasses.js
+++ b/tests/baselines/reference/jsDeclarationsClasses.js
@@ -204,8 +204,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsDeclarationsClassesErr.js b/tests/baselines/reference/jsDeclarationsClassesErr.js
index b9174f3a708..9fa59e40433 100644
--- a/tests/baselines/reference/jsDeclarationsClassesErr.js
+++ b/tests/baselines/reference/jsDeclarationsClassesErr.js
@@ -82,8 +82,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsDeclarationsDefault.js b/tests/baselines/reference/jsDeclarationsDefault.js
index d150cbe494f..a29d40099cc 100644
--- a/tests/baselines/reference/jsDeclarationsDefault.js
+++ b/tests/baselines/reference/jsDeclarationsDefault.js
@@ -77,8 +77,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js b/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
index 2e76c79d4c5..14769f07fc3 100644
--- a/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
+++ b/tests/baselines/reference/jsNoImplicitAnyNoCascadingReferenceErrors.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsdocTypeTagCast.js b/tests/baselines/reference/jsdocTypeTagCast.js
index 25493c7dd5c..94269ff3774 100644
--- a/tests/baselines/reference/jsdocTypeTagCast.js
+++ b/tests/baselines/reference/jsdocTypeTagCast.js
@@ -87,8 +87,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsxCallbackWithDestructuring.js b/tests/baselines/reference/jsxCallbackWithDestructuring.js
index 147df84c5a6..11fd8c72359 100644
--- a/tests/baselines/reference/jsxCallbackWithDestructuring.js
+++ b/tests/baselines/reference/jsxCallbackWithDestructuring.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
index 0a0201b8f65..e602b8e949e 100644
--- a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
+++ b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsxHasLiteralType.js b/tests/baselines/reference/jsxHasLiteralType.js
index 48369668d83..d921994e725 100644
--- a/tests/baselines/reference/jsxHasLiteralType.js
+++ b/tests/baselines/reference/jsxHasLiteralType.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsxInExtendsClause.js b/tests/baselines/reference/jsxInExtendsClause.js
index 6527faf3efb..a2ef9bf3796 100644
--- a/tests/baselines/reference/jsxInExtendsClause.js
+++ b/tests/baselines/reference/jsxInExtendsClause.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js
index a731d60ec21..233d8b8d1fc 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js
index 46511fed379..56204c64e9b 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index 4d367e0ab5c..166f21a9979 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -667,8 +667,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/lambdaArgCrash.js b/tests/baselines/reference/lambdaArgCrash.js
index bdce4736f1d..e6ce8d50c11 100644
--- a/tests/baselines/reference/lambdaArgCrash.js
+++ b/tests/baselines/reference/lambdaArgCrash.js
@@ -43,8 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/lift.js b/tests/baselines/reference/lift.js
index ab7051e4eda..5db64b3e5e3 100644
--- a/tests/baselines/reference/lift.js
+++ b/tests/baselines/reference/lift.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/localTypes1.js b/tests/baselines/reference/localTypes1.js
index 11d1a103c5a..18eaf3f1b37 100644
--- a/tests/baselines/reference/localTypes1.js
+++ b/tests/baselines/reference/localTypes1.js
@@ -149,8 +149,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/m7Bugs.js b/tests/baselines/reference/m7Bugs.js
index fd782b78685..c832bf0bb45 100644
--- a/tests/baselines/reference/m7Bugs.js
+++ b/tests/baselines/reference/m7Bugs.js
@@ -35,8 +35,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mappedTypePartialConstraints.js b/tests/baselines/reference/mappedTypePartialConstraints.js
index 969aba75845..f1070604bbd 100644
--- a/tests/baselines/reference/mappedTypePartialConstraints.js
+++ b/tests/baselines/reference/mappedTypePartialConstraints.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mergedDeclarations5.js b/tests/baselines/reference/mergedDeclarations5.js
index 8f9eb7f0e73..71e0ab2df52 100644
--- a/tests/baselines/reference/mergedDeclarations5.js
+++ b/tests/baselines/reference/mergedDeclarations5.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js
index 95d282c2747..2e097a6868a 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -46,8 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mergedInheritedClassInterface.js b/tests/baselines/reference/mergedInheritedClassInterface.js
index 40b99342a4c..1e5964c78e9 100644
--- a/tests/baselines/reference/mergedInheritedClassInterface.js
+++ b/tests/baselines/reference/mergedInheritedClassInterface.js
@@ -55,8 +55,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
index e24d6580c97..1f9f1aac057 100644
--- a/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
+++ b/tests/baselines/reference/mergedInheritedMembersSatisfyAbstractBase.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
index f2b7dd8c601..0e44c6441f8 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
index e11cfef736c..149e0ca3437 100644
--- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
+++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates3.js
@@ -47,8 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/missingPropertiesOfClassExpression.js b/tests/baselines/reference/missingPropertiesOfClassExpression.js
index 6aa9dc86f9d..6977750e44e 100644
--- a/tests/baselines/reference/missingPropertiesOfClassExpression.js
+++ b/tests/baselines/reference/missingPropertiesOfClassExpression.js
@@ -15,8 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mixinAccessModifiers.js b/tests/baselines/reference/mixinAccessModifiers.js
index fdc8d53f033..40bf6cb94c1 100644
--- a/tests/baselines/reference/mixinAccessModifiers.js
+++ b/tests/baselines/reference/mixinAccessModifiers.js
@@ -141,8 +141,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mixinClassesAnnotated.js b/tests/baselines/reference/mixinClassesAnnotated.js
index 9c261a62609..b3c16804410 100644
--- a/tests/baselines/reference/mixinClassesAnnotated.js
+++ b/tests/baselines/reference/mixinClassesAnnotated.js
@@ -75,8 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mixinClassesAnonymous.js b/tests/baselines/reference/mixinClassesAnonymous.js
index 857aaabdaee..426ee329a73 100644
--- a/tests/baselines/reference/mixinClassesAnonymous.js
+++ b/tests/baselines/reference/mixinClassesAnonymous.js
@@ -74,8 +74,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mixinClassesMembers.js b/tests/baselines/reference/mixinClassesMembers.js
index 71ac2995974..59e94b72b08 100644
--- a/tests/baselines/reference/mixinClassesMembers.js
+++ b/tests/baselines/reference/mixinClassesMembers.js
@@ -107,8 +107,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mixinIntersectionIsValidbaseType.js b/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
index cf90daa2032..e1caf9bf307 100644
--- a/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
+++ b/tests/baselines/reference/mixinIntersectionIsValidbaseType.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mixinPrivateAndProtected.js b/tests/baselines/reference/mixinPrivateAndProtected.js
index 4b92804a6b0..2b1b2804d2e 100644
--- a/tests/baselines/reference/mixinPrivateAndProtected.js
+++ b/tests/baselines/reference/mixinPrivateAndProtected.js
@@ -99,8 +99,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mixingApparentTypeOverrides.js b/tests/baselines/reference/mixingApparentTypeOverrides.js
index 8de21e81ef8..2be97b8e1be 100644
--- a/tests/baselines/reference/mixingApparentTypeOverrides.js
+++ b/tests/baselines/reference/mixingApparentTypeOverrides.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/moduleAsBaseType.js b/tests/baselines/reference/moduleAsBaseType.js
index 2be75e871c4..800feed7f02 100644
--- a/tests/baselines/reference/moduleAsBaseType.js
+++ b/tests/baselines/reference/moduleAsBaseType.js
@@ -13,8 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
index 7be97e8aaf8..948febd9a17 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/moduleNoneOutFile.js b/tests/baselines/reference/moduleNoneOutFile.js
index b60b12c1935..0dd2426f2d6 100644
--- a/tests/baselines/reference/moduleNoneOutFile.js
+++ b/tests/baselines/reference/moduleNoneOutFile.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
index 941dacde74c..d9a300e4814 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.js
@@ -67,8 +67,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/multipleInheritance.js b/tests/baselines/reference/multipleInheritance.js
index 62252ccce3e..50a22cd1d0d 100644
--- a/tests/baselines/reference/multipleInheritance.js
+++ b/tests/baselines/reference/multipleInheritance.js
@@ -47,8 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
index de39da0095f..2fc06167b66 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/mutuallyRecursiveInference.js b/tests/baselines/reference/mutuallyRecursiveInference.js
index e6a5aa12c34..073f0346887 100644
--- a/tests/baselines/reference/mutuallyRecursiveInference.js
+++ b/tests/baselines/reference/mutuallyRecursiveInference.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/narrowingOfDottedNames.js b/tests/baselines/reference/narrowingOfDottedNames.js
index d2bf3095ff0..77a0e12869b 100644
--- a/tests/baselines/reference/narrowingOfDottedNames.js
+++ b/tests/baselines/reference/narrowingOfDottedNames.js
@@ -102,8 +102,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/neverReturningFunctions1.js b/tests/baselines/reference/neverReturningFunctions1.js
index 24d0894fbb7..c7f34b2afe0 100644
--- a/tests/baselines/reference/neverReturningFunctions1.js
+++ b/tests/baselines/reference/neverReturningFunctions1.js
@@ -259,8 +259,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/newTarget.es5.js b/tests/baselines/reference/newTarget.es5.js
index ac8acff7160..98e99c275e3 100644
--- a/tests/baselines/reference/newTarget.es5.js
+++ b/tests/baselines/reference/newTarget.es5.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/noCrashOnMixin.js b/tests/baselines/reference/noCrashOnMixin.js
index a2f88424ac1..b09a5fff4ea 100644
--- a/tests/baselines/reference/noCrashOnMixin.js
+++ b/tests/baselines/reference/noCrashOnMixin.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
index 627ac477399..31fe2ba0746 100644
--- a/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingGetAccessor.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
index 0b38f44d2f9..04f290c4dc3 100644
--- a/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
+++ b/tests/baselines/reference/noImplicitAnyMissingSetAccessor.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
index f7b4231c21b..f58f22d8cab 100644
--- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
+++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js
@@ -14,8 +14,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
index a88f4d95d07..bddf70e93c2 100644
--- a/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/numericIndexerConstrainsPropertyDeclarations2.js
@@ -55,8 +55,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/numericIndexerConstraint3.js b/tests/baselines/reference/numericIndexerConstraint3.js
index afa676fa4f5..cf6a801e0ca 100644
--- a/tests/baselines/reference/numericIndexerConstraint3.js
+++ b/tests/baselines/reference/numericIndexerConstraint3.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/numericIndexerConstraint4.js b/tests/baselines/reference/numericIndexerConstraint4.js
index f9a8c67592e..1327d749ed2 100644
--- a/tests/baselines/reference/numericIndexerConstraint4.js
+++ b/tests/baselines/reference/numericIndexerConstraint4.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/numericIndexerTyping2.js b/tests/baselines/reference/numericIndexerTyping2.js
index 1cdcb546780..d53219bee57 100644
--- a/tests/baselines/reference/numericIndexerTyping2.js
+++ b/tests/baselines/reference/numericIndexerTyping2.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/objectCreationOfElementAccessExpression.js b/tests/baselines/reference/objectCreationOfElementAccessExpression.js
index d6eb469b401..ae688652efd 100644
--- a/tests/baselines/reference/objectCreationOfElementAccessExpression.js
+++ b/tests/baselines/reference/objectCreationOfElementAccessExpression.js
@@ -64,8 +64,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
index f53155c2fda..ec9743c369b 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
+++ b/tests/baselines/reference/objectTypeHidingMembersOfExtendedObject.js
@@ -63,8 +63,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
index 1d2029f7608..ada58bded67 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.js
@@ -132,8 +132,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
index bf650038c10..6462cc88cd4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.js
@@ -135,8 +135,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
index fba7be17950..75e272e63a5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.js
@@ -132,8 +132,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates.js b/tests/baselines/reference/objectTypesIdentityWithPrivates.js
index a458eeb39c4..9bf759ee3bf 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.js
@@ -130,8 +130,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
index 479b825a96d..3ea79327af2 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.js
@@ -48,8 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates3.js b/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
index 25873414546..f36622caf79 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates3.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
index 5c04d4cfdb2..d900e81e504 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.js
@@ -132,8 +132,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
index 25633839757..268eed44ce2 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.js
@@ -135,8 +135,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/optionalConstructorArgInSuper.js b/tests/baselines/reference/optionalConstructorArgInSuper.js
index 805d37f27c7..c88f02effb7 100644
--- a/tests/baselines/reference/optionalConstructorArgInSuper.js
+++ b/tests/baselines/reference/optionalConstructorArgInSuper.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/optionalMethods.js b/tests/baselines/reference/optionalMethods.js
index be011e9d370..2e8e12f1b6e 100644
--- a/tests/baselines/reference/optionalMethods.js
+++ b/tests/baselines/reference/optionalMethods.js
@@ -65,8 +65,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/optionalParamArgsTest.js b/tests/baselines/reference/optionalParamArgsTest.js
index 6ee8826b1f6..4778adaf18f 100644
--- a/tests/baselines/reference/optionalParamArgsTest.js
+++ b/tests/baselines/reference/optionalParamArgsTest.js
@@ -133,8 +133,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/optionalParamInOverride.js b/tests/baselines/reference/optionalParamInOverride.js
index 0dd95dacd6d..df56d1fc907 100644
--- a/tests/baselines/reference/optionalParamInOverride.js
+++ b/tests/baselines/reference/optionalParamInOverride.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/optionalParameterProperty.js b/tests/baselines/reference/optionalParameterProperty.js
index 22b0c8f03d4..ad83510bc04 100644
--- a/tests/baselines/reference/optionalParameterProperty.js
+++ b/tests/baselines/reference/optionalParameterProperty.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/outModuleConcatAmd.js b/tests/baselines/reference/outModuleConcatAmd.js
index 3b360884eed..0eebf4ec01a 100644
--- a/tests/baselines/reference/outModuleConcatAmd.js
+++ b/tests/baselines/reference/outModuleConcatAmd.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/outModuleConcatAmd.js.map b/tests/baselines/reference/outModuleConcatAmd.js.map
index 88329b5db3b..1cd86072193 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":";;;;;;;;;;;;;;;;;;;IAAA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;;;ICCd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ 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":";;;;;;;;;;;;;;;;;;;;IAAA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,cAAC;;;;;;ICCd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
index a4beef4d9fc..6861c54ac13 100644
--- a/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatAmd.sourcemap.txt
@@ -16,8 +16,9 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
->>>        if (typeof b !== "function" && b !== null)
+>>>        if (typeof b !== "function" && b !== null) {
 >>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>        }
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -31,13 +32,13 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(20, 5) Source(1, 1) + SourceIndex(0)
+1 >Emitted(21, 5) Source(1, 1) + SourceIndex(0)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(21, 9) Source(1, 1) + SourceIndex(0)
+1->Emitted(22, 9) Source(1, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -45,16 +46,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >         ^^^^^^^^^->
 1->export class A { 
 2 >        }
-1->Emitted(22, 9) Source(1, 18) + SourceIndex(0)
-2 >Emitted(22, 10) Source(1, 19) + SourceIndex(0)
+1->Emitted(23, 9) Source(1, 18) + SourceIndex(0)
+2 >Emitted(23, 10) Source(1, 19) + SourceIndex(0)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(23, 9) Source(1, 18) + SourceIndex(0)
-2 >Emitted(23, 17) Source(1, 19) + SourceIndex(0)
+1->Emitted(24, 9) Source(1, 18) + SourceIndex(0)
+2 >Emitted(24, 17) Source(1, 19) + SourceIndex(0)
 ---
 >>>    }());
 1 >^^^^
@@ -66,18 +67,18 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >    }
 3 >     
 4 >     export class A { }
-1 >Emitted(24, 5) Source(1, 18) + SourceIndex(0)
-2 >Emitted(24, 6) Source(1, 19) + SourceIndex(0)
-3 >Emitted(24, 6) Source(1, 1) + SourceIndex(0)
-4 >Emitted(24, 10) Source(1, 19) + SourceIndex(0)
+1 >Emitted(25, 5) Source(1, 18) + SourceIndex(0)
+2 >Emitted(25, 6) Source(1, 19) + SourceIndex(0)
+3 >Emitted(25, 6) Source(1, 1) + SourceIndex(0)
+4 >Emitted(25, 10) Source(1, 19) + SourceIndex(0)
 ---
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    A
-1->Emitted(25, 5) Source(1, 14) + SourceIndex(0)
-2 >Emitted(25, 19) Source(1, 15) + SourceIndex(0)
+1->Emitted(26, 5) Source(1, 14) + SourceIndex(0)
+2 >Emitted(26, 19) Source(1, 15) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -93,21 +94,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(31, 5) Source(2, 1) + SourceIndex(1)
+1 >Emitted(32, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(32, 9) Source(2, 24) + SourceIndex(1)
-2 >Emitted(32, 30) Source(2, 25) + SourceIndex(1)
+1->Emitted(33, 9) Source(2, 24) + SourceIndex(1)
+2 >Emitted(33, 30) Source(2, 25) + SourceIndex(1)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(33, 9) Source(2, 1) + SourceIndex(1)
+1 >Emitted(34, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -116,16 +117,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(35, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(35, 10) Source(2, 29) + SourceIndex(1)
+1->Emitted(36, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(36, 10) Source(2, 29) + SourceIndex(1)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(36, 9) Source(2, 28) + SourceIndex(1)
-2 >Emitted(36, 17) Source(2, 29) + SourceIndex(1)
+1->Emitted(37, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(37, 17) Source(2, 29) + SourceIndex(1)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -141,20 +142,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(37, 5) Source(2, 28) + SourceIndex(1)
-2 >Emitted(37, 6) Source(2, 29) + SourceIndex(1)
-3 >Emitted(37, 6) Source(2, 1) + SourceIndex(1)
-4 >Emitted(37, 7) Source(2, 24) + SourceIndex(1)
-5 >Emitted(37, 12) Source(2, 25) + SourceIndex(1)
-6 >Emitted(37, 15) Source(2, 29) + SourceIndex(1)
+1 >Emitted(38, 5) Source(2, 28) + SourceIndex(1)
+2 >Emitted(38, 6) Source(2, 29) + SourceIndex(1)
+3 >Emitted(38, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(38, 7) Source(2, 24) + SourceIndex(1)
+5 >Emitted(38, 12) Source(2, 25) + SourceIndex(1)
+6 >Emitted(38, 15) Source(2, 29) + SourceIndex(1)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    B
-1->Emitted(38, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(38, 19) Source(2, 15) + SourceIndex(1)
+1->Emitted(39, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(39, 19) Source(2, 15) + SourceIndex(1)
 ---
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.js b/tests/baselines/reference/outModuleConcatSystem.js
index 1f721e4359a..daf40adfdb5 100644
--- a/tests/baselines/reference/outModuleConcatSystem.js
+++ b/tests/baselines/reference/outModuleConcatSystem.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/outModuleConcatSystem.js.map b/tests/baselines/reference/outModuleConcatSystem.js.map
index a7a906b7a25..eeed28a88a3 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":";;;;;;;;;;;;;;;;;;;;;;YAAA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;;QAClB,CAAC;;;;;;;;;;;;;;YCAD;gBAAuB,qBAAC;gBAAxB;;gBAA2B,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;;QAAA,CAAC"}
\ 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":";;;;;;;;;;;;;;;;;;;;;;;YAAA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;;QAClB,CAAC;;;;;;;;;;;;;;YCAD;gBAAuB,qBAAC;gBAAxB;;gBAA2B,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;;QAAA,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
index 050b60fa6aa..d77bf0e86a0 100644
--- a/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
+++ b/tests/baselines/reference/outModuleConcatSystem.sourcemap.txt
@@ -16,8 +16,9 @@ sourceFile:tests/cases/compiler/ref/a.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
->>>        if (typeof b !== "function" && b !== null)
+>>>        if (typeof b !== "function" && b !== null) {
 >>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>        }
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -34,13 +35,13 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1 >^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(23, 13) Source(1, 1) + SourceIndex(0)
+1 >Emitted(24, 13) Source(1, 1) + SourceIndex(0)
 ---
 >>>                function A() {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^->
 1->
-1->Emitted(24, 17) Source(1, 1) + SourceIndex(0)
+1->Emitted(25, 17) Source(1, 1) + SourceIndex(0)
 ---
 >>>                }
 1->^^^^^^^^^^^^^^^^
@@ -48,16 +49,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >                 ^^^^^^^^^->
 1->export class A { 
 2 >                }
-1->Emitted(25, 17) Source(1, 18) + SourceIndex(0)
-2 >Emitted(25, 18) Source(1, 19) + SourceIndex(0)
+1->Emitted(26, 17) Source(1, 18) + SourceIndex(0)
+2 >Emitted(26, 18) Source(1, 19) + SourceIndex(0)
 ---
 >>>                return A;
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^
 1->
 2 >                }
-1->Emitted(26, 17) Source(1, 18) + SourceIndex(0)
-2 >Emitted(26, 25) Source(1, 19) + SourceIndex(0)
+1->Emitted(27, 17) Source(1, 18) + SourceIndex(0)
+2 >Emitted(27, 25) Source(1, 19) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -69,10 +70,10 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >            }
 3 >             
 4 >             export class A { }
-1 >Emitted(27, 13) Source(1, 18) + SourceIndex(0)
-2 >Emitted(27, 14) Source(1, 19) + SourceIndex(0)
-3 >Emitted(27, 14) Source(1, 1) + SourceIndex(0)
-4 >Emitted(27, 18) Source(1, 19) + SourceIndex(0)
+1 >Emitted(28, 13) Source(1, 18) + SourceIndex(0)
+2 >Emitted(28, 14) Source(1, 19) + SourceIndex(0)
+3 >Emitted(28, 14) Source(1, 1) + SourceIndex(0)
+4 >Emitted(28, 18) Source(1, 19) + SourceIndex(0)
 ---
 >>>            exports_1("A", A);
 >>>        }
@@ -81,8 +82,8 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1->
   >
 2 >        
-1->Emitted(29, 9) Source(2, 1) + SourceIndex(0)
-2 >Emitted(29, 10) Source(2, 2) + SourceIndex(0)
+1->Emitted(30, 9) Source(2, 1) + SourceIndex(0)
+2 >Emitted(30, 10) Source(2, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -106,21 +107,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(43, 13) Source(2, 1) + SourceIndex(1)
+1 >Emitted(44, 13) Source(2, 1) + SourceIndex(1)
 ---
 >>>                __extends(B, _super);
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >                A
-1->Emitted(44, 17) Source(2, 24) + SourceIndex(1)
-2 >Emitted(44, 38) Source(2, 25) + SourceIndex(1)
+1->Emitted(45, 17) Source(2, 24) + SourceIndex(1)
+2 >Emitted(45, 38) Source(2, 25) + SourceIndex(1)
 ---
 >>>                function B() {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(45, 17) Source(2, 1) + SourceIndex(1)
+1 >Emitted(46, 17) Source(2, 1) + SourceIndex(1)
 ---
 >>>                    return _super !== null && _super.apply(this, arguments) || this;
 >>>                }
@@ -129,16 +130,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >                 ^^^^^^^^^->
 1->export class B extends A { 
 2 >                }
-1->Emitted(47, 17) Source(2, 28) + SourceIndex(1)
-2 >Emitted(47, 18) Source(2, 29) + SourceIndex(1)
+1->Emitted(48, 17) Source(2, 28) + SourceIndex(1)
+2 >Emitted(48, 18) Source(2, 29) + SourceIndex(1)
 ---
 >>>                return B;
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^
 1->
 2 >                }
-1->Emitted(48, 17) Source(2, 28) + SourceIndex(1)
-2 >Emitted(48, 25) Source(2, 29) + SourceIndex(1)
+1->Emitted(49, 17) Source(2, 28) + SourceIndex(1)
+2 >Emitted(49, 25) Source(2, 29) + SourceIndex(1)
 ---
 >>>            }(a_1.A));
 1 >^^^^^^^^^^^^
@@ -154,12 +155,12 @@ sourceFile:tests/cases/compiler/b.ts
 4 >             export class B extends 
 5 >              A
 6 >                    { }
-1 >Emitted(49, 13) Source(2, 28) + SourceIndex(1)
-2 >Emitted(49, 14) Source(2, 29) + SourceIndex(1)
-3 >Emitted(49, 14) Source(2, 1) + SourceIndex(1)
-4 >Emitted(49, 15) Source(2, 24) + SourceIndex(1)
-5 >Emitted(49, 20) Source(2, 25) + SourceIndex(1)
-6 >Emitted(49, 23) Source(2, 29) + SourceIndex(1)
+1 >Emitted(50, 13) Source(2, 28) + SourceIndex(1)
+2 >Emitted(50, 14) Source(2, 29) + SourceIndex(1)
+3 >Emitted(50, 14) Source(2, 1) + SourceIndex(1)
+4 >Emitted(50, 15) Source(2, 24) + SourceIndex(1)
+5 >Emitted(50, 20) Source(2, 25) + SourceIndex(1)
+6 >Emitted(50, 23) Source(2, 29) + SourceIndex(1)
 ---
 >>>            exports_2("B", B);
 >>>        }
@@ -167,8 +168,8 @@ sourceFile:tests/cases/compiler/b.ts
 2 >        ^
 1->
 2 >        
-1->Emitted(51, 9) Source(2, 29) + SourceIndex(1)
-2 >Emitted(51, 10) Source(2, 30) + SourceIndex(1)
+1->Emitted(52, 9) Source(2, 29) + SourceIndex(1)
+2 >Emitted(52, 10) Source(2, 30) + SourceIndex(1)
 ---
 >>>    };
 >>>});
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js b/tests/baselines/reference/outModuleTripleSlashRefs.js
index 5d0cbd0f5b2..0da2aab44c2 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.js
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.js
@@ -38,8 +38,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.js.map b/tests/baselines/reference/outModuleTripleSlashRefs.js.map
index 664558132f4..b81e3221f79 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;;;;;ICHD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,cAAC;;;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ 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;;;;;ICHD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,cAAC;;;;;;ICAd;QAAuB,qBAAC;QAAxB;;QAA2B,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,CAAuB,KAAC,GAAI;IAAf,cAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
index 0475ba6eb3d..f89bac38001 100644
--- a/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt
@@ -16,8 +16,9 @@ sourceFile:tests/cases/compiler/ref/b.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
->>>        if (typeof b !== "function" && b !== null)
+>>>        if (typeof b !== "function" && b !== null) {
 >>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>        }
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -29,21 +30,21 @@ sourceFile:tests/cases/compiler/ref/b.ts
 3 >                                 ^^^^^^->
 1 >
 2 >/// <reference path="./c.d.ts" />
-1 >Emitted(16, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(16, 34) Source(1, 34) + SourceIndex(0)
+1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(17, 34) Source(1, 34) + SourceIndex(0)
 ---
 >>>var Foo = /** @class */ (function () {
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(17, 1) Source(2, 1) + SourceIndex(0)
+1->Emitted(18, 1) Source(2, 1) + SourceIndex(0)
 ---
 >>>    function Foo() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(18, 5) Source(2, 1) + SourceIndex(0)
+1->Emitted(19, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -53,16 +54,16 @@ sourceFile:tests/cases/compiler/ref/b.ts
   >	member: Bar;
   >
 2 >    }
-1->Emitted(19, 5) Source(4, 1) + SourceIndex(0)
-2 >Emitted(19, 6) Source(4, 2) + SourceIndex(0)
+1->Emitted(20, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(20, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return Foo;
 1->^^^^
 2 >    ^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(20, 5) Source(4, 1) + SourceIndex(0)
-2 >Emitted(20, 15) Source(4, 2) + SourceIndex(0)
+1->Emitted(21, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(21, 15) Source(4, 2) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -76,10 +77,10 @@ sourceFile:tests/cases/compiler/ref/b.ts
 4 > class Foo {
   > 	member: Bar;
   > }
-1 >Emitted(21, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(21, 2) Source(4, 2) + SourceIndex(0)
-3 >Emitted(21, 2) Source(2, 1) + SourceIndex(0)
-4 >Emitted(21, 6) Source(4, 2) + SourceIndex(0)
+1 >Emitted(22, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(22, 2) Source(4, 2) + SourceIndex(0)
+3 >Emitted(22, 2) Source(2, 1) + SourceIndex(0)
+4 >Emitted(22, 6) Source(4, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -95,21 +96,21 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >                                   ^^^^^^->
 1->
 2 >    /// <reference path="./b.ts" />
-1->Emitted(26, 5) Source(1, 1) + SourceIndex(1)
-2 >Emitted(26, 36) Source(1, 32) + SourceIndex(1)
+1->Emitted(27, 5) Source(1, 1) + SourceIndex(1)
+2 >Emitted(27, 36) Source(1, 32) + SourceIndex(1)
 ---
 >>>    var A = /** @class */ (function () {
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^->
 1->
   >
-1->Emitted(27, 5) Source(2, 1) + SourceIndex(1)
+1->Emitted(28, 5) Source(2, 1) + SourceIndex(1)
 ---
 >>>        function A() {
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(28, 9) Source(2, 1) + SourceIndex(1)
+1->Emitted(29, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -119,16 +120,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
   >	member: typeof GlobalFoo;
   >
 2 >        }
-1->Emitted(29, 9) Source(4, 1) + SourceIndex(1)
-2 >Emitted(29, 10) Source(4, 2) + SourceIndex(1)
+1->Emitted(30, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(30, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(30, 9) Source(4, 1) + SourceIndex(1)
-2 >Emitted(30, 17) Source(4, 2) + SourceIndex(1)
+1->Emitted(31, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(31, 17) Source(4, 2) + SourceIndex(1)
 ---
 >>>    }());
 1 >^^^^
@@ -142,18 +143,18 @@ sourceFile:tests/cases/compiler/ref/a.ts
 4 >     export class A {
   >     	member: typeof GlobalFoo;
   >     }
-1 >Emitted(31, 5) Source(4, 1) + SourceIndex(1)
-2 >Emitted(31, 6) Source(4, 2) + SourceIndex(1)
-3 >Emitted(31, 6) Source(2, 1) + SourceIndex(1)
-4 >Emitted(31, 10) Source(4, 2) + SourceIndex(1)
+1 >Emitted(32, 5) Source(4, 1) + SourceIndex(1)
+2 >Emitted(32, 6) Source(4, 2) + SourceIndex(1)
+3 >Emitted(32, 6) Source(2, 1) + SourceIndex(1)
+4 >Emitted(32, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>    exports.A = A;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    A
-1->Emitted(32, 5) Source(2, 14) + SourceIndex(1)
-2 >Emitted(32, 19) Source(2, 15) + SourceIndex(1)
+1->Emitted(33, 5) Source(2, 14) + SourceIndex(1)
+2 >Emitted(33, 19) Source(2, 15) + SourceIndex(1)
 ---
 -------------------------------------------------------------------
 emittedFile:all.js
@@ -169,21 +170,21 @@ sourceFile:tests/cases/compiler/b.ts
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >import {A} from "./ref/a";
   >
-1 >Emitted(38, 5) Source(2, 1) + SourceIndex(2)
+1 >Emitted(39, 5) Source(2, 1) + SourceIndex(2)
 ---
 >>>        __extends(B, _super);
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(39, 9) Source(2, 24) + SourceIndex(2)
-2 >Emitted(39, 30) Source(2, 25) + SourceIndex(2)
+1->Emitted(40, 9) Source(2, 24) + SourceIndex(2)
+2 >Emitted(40, 30) Source(2, 25) + SourceIndex(2)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(40, 9) Source(2, 1) + SourceIndex(2)
+1 >Emitted(41, 9) Source(2, 1) + SourceIndex(2)
 ---
 >>>            return _super !== null && _super.apply(this, arguments) || this;
 >>>        }
@@ -192,16 +193,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1->export class B extends A { 
 2 >        }
-1->Emitted(42, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(42, 10) Source(2, 29) + SourceIndex(2)
+1->Emitted(43, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(43, 10) Source(2, 29) + SourceIndex(2)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(43, 9) Source(2, 28) + SourceIndex(2)
-2 >Emitted(43, 17) Source(2, 29) + SourceIndex(2)
+1->Emitted(44, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(44, 17) Source(2, 29) + SourceIndex(2)
 ---
 >>>    }(a_1.A));
 1 >^^^^
@@ -217,20 +218,20 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >      A
 6 >            { }
-1 >Emitted(44, 5) Source(2, 28) + SourceIndex(2)
-2 >Emitted(44, 6) Source(2, 29) + SourceIndex(2)
-3 >Emitted(44, 6) Source(2, 1) + SourceIndex(2)
-4 >Emitted(44, 7) Source(2, 24) + SourceIndex(2)
-5 >Emitted(44, 12) Source(2, 25) + SourceIndex(2)
-6 >Emitted(44, 15) Source(2, 29) + SourceIndex(2)
+1 >Emitted(45, 5) Source(2, 28) + SourceIndex(2)
+2 >Emitted(45, 6) Source(2, 29) + SourceIndex(2)
+3 >Emitted(45, 6) Source(2, 1) + SourceIndex(2)
+4 >Emitted(45, 7) Source(2, 24) + SourceIndex(2)
+5 >Emitted(45, 12) Source(2, 25) + SourceIndex(2)
+6 >Emitted(45, 15) Source(2, 29) + SourceIndex(2)
 ---
 >>>    exports.B = B;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^
 1->
 2 >    B
-1->Emitted(45, 5) Source(2, 14) + SourceIndex(2)
-2 >Emitted(45, 19) Source(2, 15) + SourceIndex(2)
+1->Emitted(46, 5) Source(2, 14) + SourceIndex(2)
+2 >Emitted(46, 19) Source(2, 15) + SourceIndex(2)
 ---
 >>>});
 >>>//# sourceMappingURL=all.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/overload1.js b/tests/baselines/reference/overload1.js
index 69f8c063453..4405bf7c8df 100644
--- a/tests/baselines/reference/overload1.js
+++ b/tests/baselines/reference/overload1.js
@@ -48,8 +48,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks1.js b/tests/baselines/reference/overloadOnConstConstraintChecks1.js
index db5019c35c9..7cb2efd947c 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks1.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks1.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks2.js b/tests/baselines/reference/overloadOnConstConstraintChecks2.js
index 34961cd5c7c..e12ff81fd12 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks3.js b/tests/baselines/reference/overloadOnConstConstraintChecks3.js
index 9e94af61b6f..a7f413ff3e5 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks4.js b/tests/baselines/reference/overloadOnConstConstraintChecks4.js
index 8e4558e0bfa..eeeb0717ff8 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks4.js
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks4.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
index fe23d72dc21..ee2d71cf0a9 100644
--- a/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
+++ b/tests/baselines/reference/overloadOnConstantsInvalidOverload1.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overloadResolution.js b/tests/baselines/reference/overloadResolution.js
index 3e7ec7be445..b8f69215ce9 100644
--- a/tests/baselines/reference/overloadResolution.js
+++ b/tests/baselines/reference/overloadResolution.js
@@ -103,8 +103,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overloadResolutionClassConstructors.js b/tests/baselines/reference/overloadResolutionClassConstructors.js
index f0878fbaa93..b2193425996 100644
--- a/tests/baselines/reference/overloadResolutionClassConstructors.js
+++ b/tests/baselines/reference/overloadResolutionClassConstructors.js
@@ -110,8 +110,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overloadResolutionConstructors.js b/tests/baselines/reference/overloadResolutionConstructors.js
index 2d0bce82f56..f5ad8ac1839 100644
--- a/tests/baselines/reference/overloadResolutionConstructors.js
+++ b/tests/baselines/reference/overloadResolutionConstructors.js
@@ -111,8 +111,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overloadingOnConstants1.js b/tests/baselines/reference/overloadingOnConstants1.js
index a290f00402b..baaeb86eb6d 100644
--- a/tests/baselines/reference/overloadingOnConstants1.js
+++ b/tests/baselines/reference/overloadingOnConstants1.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overloadingOnConstants2.js b/tests/baselines/reference/overloadingOnConstants2.js
index bbe734f79cd..5d21dd547ed 100644
--- a/tests/baselines/reference/overloadingOnConstants2.js
+++ b/tests/baselines/reference/overloadingOnConstants2.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overrideBaseIntersectionMethod.js b/tests/baselines/reference/overrideBaseIntersectionMethod.js
index fa626a6886d..697131ab8ed 100644
--- a/tests/baselines/reference/overrideBaseIntersectionMethod.js
+++ b/tests/baselines/reference/overrideBaseIntersectionMethod.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/overridingPrivateStaticMembers.js b/tests/baselines/reference/overridingPrivateStaticMembers.js
index 45a3e297d6f..114aa968d45 100644
--- a/tests/baselines/reference/overridingPrivateStaticMembers.js
+++ b/tests/baselines/reference/overridingPrivateStaticMembers.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parseErrorInHeritageClause1.js b/tests/baselines/reference/parseErrorInHeritageClause1.js
index 709ba3cb1a5..951de322d75 100644
--- a/tests/baselines/reference/parseErrorInHeritageClause1.js
+++ b/tests/baselines/reference/parseErrorInHeritageClause1.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parser509630.js b/tests/baselines/reference/parser509630.js
index 52958aeb8b1..061489933ac 100644
--- a/tests/baselines/reference/parser509630.js
+++ b/tests/baselines/reference/parser509630.js
@@ -15,8 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserAstSpans1.js b/tests/baselines/reference/parserAstSpans1.js
index 7fcaba5f2af..b2f0649ae9c 100644
--- a/tests/baselines/reference/parserAstSpans1.js
+++ b/tests/baselines/reference/parserAstSpans1.js
@@ -228,8 +228,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserClassDeclaration1.js b/tests/baselines/reference/parserClassDeclaration1.js
index b1bbca204aa..adb0aa59cc4 100644
--- a/tests/baselines/reference/parserClassDeclaration1.js
+++ b/tests/baselines/reference/parserClassDeclaration1.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserClassDeclaration3.js b/tests/baselines/reference/parserClassDeclaration3.js
index 4c59bce599a..8f32ccd4b1a 100644
--- a/tests/baselines/reference/parserClassDeclaration3.js
+++ b/tests/baselines/reference/parserClassDeclaration3.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserClassDeclaration4.js b/tests/baselines/reference/parserClassDeclaration4.js
index 5a8c897b3b5..ad3de685e4e 100644
--- a/tests/baselines/reference/parserClassDeclaration4.js
+++ b/tests/baselines/reference/parserClassDeclaration4.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserClassDeclaration5.js b/tests/baselines/reference/parserClassDeclaration5.js
index 7516593953b..060a81492f4 100644
--- a/tests/baselines/reference/parserClassDeclaration5.js
+++ b/tests/baselines/reference/parserClassDeclaration5.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserClassDeclaration6.js b/tests/baselines/reference/parserClassDeclaration6.js
index 5e9515a6bd6..b74c78df764 100644
--- a/tests/baselines/reference/parserClassDeclaration6.js
+++ b/tests/baselines/reference/parserClassDeclaration6.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
index fd84e40f29c..f47cd7cae02 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause2.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
index 7a7a4560fd4..93e5e579360 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause4.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
index 17937b4db6b..4069a34360c 100644
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause5.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts1.js b/tests/baselines/reference/parserGenericsInTypeContexts1.js
index 7c81cf05d50..16ca6a0704f 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts2.js b/tests/baselines/reference/parserGenericsInTypeContexts2.js
index 82bf0a715ba..cb967d32950 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.js
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserRealSource10.js b/tests/baselines/reference/parserRealSource10.js
index 9f16800d3a3..b55289f9efc 100644
--- a/tests/baselines/reference/parserRealSource10.js
+++ b/tests/baselines/reference/parserRealSource10.js
@@ -466,8 +466,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserRealSource11.js b/tests/baselines/reference/parserRealSource11.js
index 182f2c8cf30..384b89cd525 100644
--- a/tests/baselines/reference/parserRealSource11.js
+++ b/tests/baselines/reference/parserRealSource11.js
@@ -2375,8 +2375,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/parserharness.js b/tests/baselines/reference/parserharness.js
index b49f85e7e42..b96a879fa03 100644
--- a/tests/baselines/reference/parserharness.js
+++ b/tests/baselines/reference/parserharness.js
@@ -2104,8 +2104,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
index a959fb8efd7..005af817d22 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceError.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
index e4a55c74969..e54c78e7cec 100644
--- a/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
+++ b/tests/baselines/reference/partiallyAnnotatedFunctionInferenceWithTypeParameter.js
@@ -43,8 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/primitiveMembers.js b/tests/baselines/reference/primitiveMembers.js
index d8bfb663ae7..e4e889ca71d 100644
--- a/tests/baselines/reference/primitiveMembers.js
+++ b/tests/baselines/reference/primitiveMembers.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/privacyClass.js b/tests/baselines/reference/privacyClass.js
index dd5a08e9b51..e90891e3f1a 100644
--- a/tests/baselines/reference/privacyClass.js
+++ b/tests/baselines/reference/privacyClass.js
@@ -137,8 +137,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
index 0c5b48ca4a2..0db9898a07b 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -106,8 +106,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -304,8 +305,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/privacyGloClass.js b/tests/baselines/reference/privacyGloClass.js
index 577263c8ad8..c20a6d17a30 100644
--- a/tests/baselines/reference/privacyGloClass.js
+++ b/tests/baselines/reference/privacyGloClass.js
@@ -69,8 +69,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/privateAccessInSubclass1.js b/tests/baselines/reference/privateAccessInSubclass1.js
index 4f6b4586b15..f43d4d3039f 100644
--- a/tests/baselines/reference/privateAccessInSubclass1.js
+++ b/tests/baselines/reference/privateAccessInSubclass1.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/privateInstanceMemberAccessibility.js b/tests/baselines/reference/privateInstanceMemberAccessibility.js
index 92fcfb0648c..85b6eb408b5 100644
--- a/tests/baselines/reference/privateInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/privateInstanceMemberAccessibility.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js b/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
index 46618b80e2f..7695f95f952 100644
--- a/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
+++ b/tests/baselines/reference/privateProtectedMembersAreNotAccessibleDestructuring.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/privateStaticMemberAccessibility.js b/tests/baselines/reference/privateStaticMemberAccessibility.js
index d508a3e4a80..1b058e6e4ed 100644
--- a/tests/baselines/reference/privateStaticMemberAccessibility.js
+++ b/tests/baselines/reference/privateStaticMemberAccessibility.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
index 93d6de686a3..d1192072623 100644
--- a/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
+++ b/tests/baselines/reference/privateStaticNotAccessibleInClodule2.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
index 0d5d8a620cd..67edbb32c76 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/testGlo.js
@@ -6,8 +6,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
index 0d5d8a620cd..67edbb32c76 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/testGlo.js
@@ -6,8 +6,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/project/prologueEmit/amd/out.js b/tests/baselines/reference/project/prologueEmit/amd/out.js
index 5fa132a8f28..1a64f288ebb 100644
--- a/tests/baselines/reference/project/prologueEmit/amd/out.js
+++ b/tests/baselines/reference/project/prologueEmit/amd/out.js
@@ -6,8 +6,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/project/prologueEmit/node/out.js b/tests/baselines/reference/project/prologueEmit/node/out.js
index 5fa132a8f28..1a64f288ebb 100644
--- a/tests/baselines/reference/project/prologueEmit/node/out.js
+++ b/tests/baselines/reference/project/prologueEmit/node/out.js
@@ -6,8 +6,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
index c8adc86478b..0a0b0ec9d43 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.js
@@ -7,8 +7,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
index c8adc86478b..0a0b0ec9d43 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.js
@@ -7,8 +7,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/propertiesAndIndexers.js b/tests/baselines/reference/propertiesAndIndexers.js
index c2e73029b7c..2caa4f9aff4 100644
--- a/tests/baselines/reference/propertiesAndIndexers.js
+++ b/tests/baselines/reference/propertiesAndIndexers.js
@@ -60,8 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/propertyAccess.js b/tests/baselines/reference/propertyAccess.js
index 093b780a62f..5fe7cc85599 100644
--- a/tests/baselines/reference/propertyAccess.js
+++ b/tests/baselines/reference/propertyAccess.js
@@ -159,8 +159,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
index c494c4dc8d6..cc40b669491 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js
@@ -91,8 +91,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
index 27929ebf3ad..ee4a4553559 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js
@@ -66,8 +66,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
index 1a4f0a27f2e..dab1983f8a7 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js
@@ -53,8 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/propertyOverridesAccessors4.js b/tests/baselines/reference/propertyOverridesAccessors4.js
index 014a5013ec9..d6f89d3d44a 100644
--- a/tests/baselines/reference/propertyOverridesAccessors4.js
+++ b/tests/baselines/reference/propertyOverridesAccessors4.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/propertyOverridingPrototype.js b/tests/baselines/reference/propertyOverridingPrototype.js
index 6c0588fd1cd..f701af5227d 100644
--- a/tests/baselines/reference/propertyOverridingPrototype.js
+++ b/tests/baselines/reference/propertyOverridingPrototype.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
index d6fdf461e6a..0718ddf1a2e 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass.js
@@ -46,8 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
index f2de756499e..58adf2a7e32 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinNestedSubclass1.js
@@ -123,8 +123,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
index 1485e5102cf..657cbbc62f2 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
index 1f9c6c354f4..c784adc5070 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass2.js
@@ -103,8 +103,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
index 939ae7bab7a..d60de9a2278 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.js b/tests/baselines/reference/protectedInstanceMemberAccessibility.js
index e621bd73dfb..4f2a7b479da 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.js
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.js
@@ -53,8 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/protectedMembers.js b/tests/baselines/reference/protectedMembers.js
index 2c57eefd5d6..b5ef7a42d14 100644
--- a/tests/baselines/reference/protectedMembers.js
+++ b/tests/baselines/reference/protectedMembers.js
@@ -124,8 +124,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
index dd395868cbc..092e0d760bc 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass.js
@@ -52,8 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
index e050ca7f282..4d5dff9bfbe 100644
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
+++ b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
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 356fe07017c..08941e71f91 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
@@ -15,8 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
index 12005b16c32..085a4df0905 100644
--- a/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
+++ b/tests/baselines/reference/reactDefaultPropsInferenceSuccess.js
@@ -79,8 +79,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/reactHOCSpreadprops.js b/tests/baselines/reference/reactHOCSpreadprops.js
index 08d074a09b1..aa2b6137d93 100644
--- a/tests/baselines/reference/reactHOCSpreadprops.js
+++ b/tests/baselines/reference/reactHOCSpreadprops.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
index 1a659a73636..8989621f076 100644
--- a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
+++ b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
index 92bb9126a13..d823384e47e 100644
--- a/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
+++ b/tests/baselines/reference/reactReduxLikeDeferredInferenceAllowsAssignment.js
@@ -157,8 +157,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js b/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
index 21c9b2ee2d0..13f10b8d70f 100644
--- a/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
+++ b/tests/baselines/reference/readonlyAssignmentInSubclassOfClassExpression.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/readonlyConstructorAssignment.js b/tests/baselines/reference/readonlyConstructorAssignment.js
index 9f19d092270..9d83fe78e86 100644
--- a/tests/baselines/reference/readonlyConstructorAssignment.js
+++ b/tests/baselines/reference/readonlyConstructorAssignment.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/recursiveBaseCheck3.js b/tests/baselines/reference/recursiveBaseCheck3.js
index 18df2b2d54d..fef99a0e1c1 100644
--- a/tests/baselines/reference/recursiveBaseCheck3.js
+++ b/tests/baselines/reference/recursiveBaseCheck3.js
@@ -13,8 +13,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/recursiveBaseCheck4.js b/tests/baselines/reference/recursiveBaseCheck4.js
index 5eb66b604fb..2c483b0a0ee 100644
--- a/tests/baselines/reference/recursiveBaseCheck4.js
+++ b/tests/baselines/reference/recursiveBaseCheck4.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/recursiveBaseCheck6.js b/tests/baselines/reference/recursiveBaseCheck6.js
index b4ba9660754..df5d3b06b73 100644
--- a/tests/baselines/reference/recursiveBaseCheck6.js
+++ b/tests/baselines/reference/recursiveBaseCheck6.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/recursiveBaseConstructorCreation1.js b/tests/baselines/reference/recursiveBaseConstructorCreation1.js
index cc503899c22..68b7bf6319e 100644
--- a/tests/baselines/reference/recursiveBaseConstructorCreation1.js
+++ b/tests/baselines/reference/recursiveBaseConstructorCreation1.js
@@ -15,8 +15,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
index 175d78620b4..0b869b23b20 100644
--- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
+++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js b/tests/baselines/reference/recursiveClassReferenceTest.js
index 7aea03bd667..c4c68166bf8 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.js
+++ b/tests/baselines/reference/recursiveClassReferenceTest.js
@@ -113,8 +113,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.js.map b/tests/baselines/reference/recursiveClassReferenceTest.js.map
index 84f26cd4967..b87b394c3d6 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;gBAC/B;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,OAAO,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,OAAO,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,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO;YAC1B;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,IAAI,IAAI,EAAE;oBAAC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;iBAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,OAAO,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,OAAO,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS;gBAEtC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,OAAO,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,OAAO,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,OAAO,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;;oBAQA,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,OAAO,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
+{"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;gBAC/B;oBAAA;oBAQA,CAAC;oBANO,+BAAK,GAAZ,cAAiB,OAAO,IAAI,CAAC,CAAC,CAAC;oBAExB,6BAAG,GAAV,UAAW,KAA6B;wBAEvC,OAAO,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,WAAO,MAAM;IAAC,IAAA,KAAK,CAoBlB;IApBa,WAAA,KAAK;QAAC,IAAA,OAAO,CAoB1B;QApBmB,WAAA,OAAO;YAC1B;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,IAAI,IAAI,EAAE;oBAAC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;iBAAC,CAAA,CAAC;gBAQlF,+BAAU,GAAjB;oBACC,OAAO,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,OAAO,IAAI,CAAC,CAAA,CAAC;IAAC,mBAAC;AAAD,CAAC,AAAxF,IAAwF;AASxF,WAAO,MAAM;IAAC,IAAA,KAAK,CAwBlB;IAxBa,WAAA,KAAK;QAAC,IAAA,SAAS,CAwB5B;QAxBmB,WAAA,SAAS;YAAC,IAAA,SAAS,CAwBtC;YAxB6B,WAAA,SAAS;gBAEtC;oBACO,eAAoB,IAAW;wBAAX,SAAI,GAAJ,IAAI,CAAO;oBAAI,CAAC;oBACnC,qBAAK,GAAZ;wBACC,OAAO,IAAI,CAAC;oBACb,CAAC;oBAEM,sBAAM,GAAb,UAAc,KAAY;wBACzB,OAAO,IAAI,KAAK,KAAK,CAAC;oBACvB,CAAC;oBAEM,uBAAO,GAAd,cAA0B,OAAO,IAAI,CAAC,CAAC,CAAC;oBACzC,YAAC;gBAAD,CAAC,AAXD,IAWC;gBAXY,eAAK,QAWjB,CAAA;gBAED;oBAA0B,wBAAY;oBAAtC;;oBAQA,CAAC;oBANA,aAAa;oBACN,8BAAe,GAAtB;wBACC,OAAO,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 9e6e801affa..2540891baa0 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
+++ b/tests/baselines/reference/recursiveClassReferenceTest.sourcemap.txt
@@ -34,8 +34,9 @@ sourceFile:recursiveClassReferenceTest.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
->>>        if (typeof b !== "function" && b !== null)
+>>>        if (typeof b !== "function" && b !== null) {
 >>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>        }
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -91,10 +92,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >          		}
   >          	}
   >          }
-1 >Emitted(18, 1) Source(32, 1) + SourceIndex(0)
-2 >Emitted(18, 5) Source(32, 8) + SourceIndex(0)
-3 >Emitted(18, 11) Source(32, 14) + SourceIndex(0)
-4 >Emitted(18, 12) Source(42, 2) + SourceIndex(0)
+1 >Emitted(19, 1) Source(32, 1) + SourceIndex(0)
+2 >Emitted(19, 5) Source(32, 8) + SourceIndex(0)
+3 >Emitted(19, 11) Source(32, 14) + SourceIndex(0)
+4 >Emitted(19, 12) Source(42, 2) + SourceIndex(0)
 ---
 >>>(function (Sample) {
 1->
@@ -103,9 +104,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >module 
 3 >           Sample
-1->Emitted(19, 1) Source(32, 1) + SourceIndex(0)
-2 >Emitted(19, 12) Source(32, 8) + SourceIndex(0)
-3 >Emitted(19, 18) Source(32, 14) + SourceIndex(0)
+1->Emitted(20, 1) Source(32, 1) + SourceIndex(0)
+2 >Emitted(20, 12) Source(32, 8) + SourceIndex(0)
+3 >Emitted(20, 18) Source(32, 14) + SourceIndex(0)
 ---
 >>>    var Actions;
 1 >^^^^
@@ -127,10 +128,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >               		}
   >               	}
   >               }
-1 >Emitted(20, 5) Source(32, 15) + SourceIndex(0)
-2 >Emitted(20, 9) Source(32, 15) + SourceIndex(0)
-3 >Emitted(20, 16) Source(32, 22) + SourceIndex(0)
-4 >Emitted(20, 17) Source(42, 2) + SourceIndex(0)
+1 >Emitted(21, 5) Source(32, 15) + SourceIndex(0)
+2 >Emitted(21, 9) Source(32, 15) + SourceIndex(0)
+3 >Emitted(21, 16) Source(32, 22) + SourceIndex(0)
+4 >Emitted(21, 17) Source(42, 2) + SourceIndex(0)
 ---
 >>>    (function (Actions) {
 1->^^^^
@@ -139,9 +140,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Actions
-1->Emitted(21, 5) Source(32, 15) + SourceIndex(0)
-2 >Emitted(21, 16) Source(32, 15) + SourceIndex(0)
-3 >Emitted(21, 23) Source(32, 22) + SourceIndex(0)
+1->Emitted(22, 5) Source(32, 15) + SourceIndex(0)
+2 >Emitted(22, 16) Source(32, 15) + SourceIndex(0)
+3 >Emitted(22, 23) Source(32, 22) + SourceIndex(0)
 ---
 >>>        var Thing;
 1 >^^^^^^^^
@@ -163,10 +164,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 		}
   >                 	}
   >                 }
-1 >Emitted(22, 9) Source(32, 23) + SourceIndex(0)
-2 >Emitted(22, 13) Source(32, 23) + SourceIndex(0)
-3 >Emitted(22, 18) Source(32, 28) + SourceIndex(0)
-4 >Emitted(22, 19) Source(42, 2) + SourceIndex(0)
+1 >Emitted(23, 9) Source(32, 23) + SourceIndex(0)
+2 >Emitted(23, 13) Source(32, 23) + SourceIndex(0)
+3 >Emitted(23, 18) Source(32, 28) + SourceIndex(0)
+4 >Emitted(23, 19) Source(42, 2) + SourceIndex(0)
 ---
 >>>        (function (Thing_1) {
 1->^^^^^^^^
@@ -175,9 +176,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Thing
-1->Emitted(23, 9) Source(32, 23) + SourceIndex(0)
-2 >Emitted(23, 20) Source(32, 23) + SourceIndex(0)
-3 >Emitted(23, 27) Source(32, 28) + SourceIndex(0)
+1->Emitted(24, 9) Source(32, 23) + SourceIndex(0)
+2 >Emitted(24, 20) Source(32, 23) + SourceIndex(0)
+3 >Emitted(24, 27) Source(32, 28) + SourceIndex(0)
 ---
 >>>            var Find;
 1 >^^^^^^^^^^^^
@@ -199,10 +200,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    		}
   >                    	}
   >                    }
-1 >Emitted(24, 13) Source(32, 29) + SourceIndex(0)
-2 >Emitted(24, 17) Source(32, 29) + SourceIndex(0)
-3 >Emitted(24, 21) Source(32, 33) + SourceIndex(0)
-4 >Emitted(24, 22) Source(42, 2) + SourceIndex(0)
+1 >Emitted(25, 13) Source(32, 29) + SourceIndex(0)
+2 >Emitted(25, 17) Source(32, 29) + SourceIndex(0)
+3 >Emitted(25, 21) Source(32, 33) + SourceIndex(0)
+4 >Emitted(25, 22) Source(42, 2) + SourceIndex(0)
 ---
 >>>            (function (Find) {
 1->^^^^^^^^^^^^
@@ -212,22 +213,22 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >            
 3 >                       Find
-1->Emitted(25, 13) Source(32, 29) + SourceIndex(0)
-2 >Emitted(25, 24) Source(32, 29) + SourceIndex(0)
-3 >Emitted(25, 28) Source(32, 33) + SourceIndex(0)
+1->Emitted(26, 13) Source(32, 29) + SourceIndex(0)
+2 >Emitted(26, 24) Source(32, 29) + SourceIndex(0)
+3 >Emitted(26, 28) Source(32, 33) + SourceIndex(0)
 ---
 >>>                var StartFindAction = /** @class */ (function () {
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >	
-1->Emitted(26, 17) Source(33, 2) + SourceIndex(0)
+1->Emitted(27, 17) Source(33, 2) + SourceIndex(0)
 ---
 >>>                    function StartFindAction() {
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^->
 1->
-1->Emitted(27, 21) Source(33, 2) + SourceIndex(0)
+1->Emitted(28, 21) Source(33, 2) + SourceIndex(0)
 ---
 >>>                    }
 1->^^^^^^^^^^^^^^^^^^^^
@@ -243,8 +244,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >		}
   >	
 2 >                    }
-1->Emitted(28, 21) Source(41, 2) + SourceIndex(0)
-2 >Emitted(28, 22) Source(41, 3) + SourceIndex(0)
+1->Emitted(29, 21) Source(41, 2) + SourceIndex(0)
+2 >Emitted(29, 22) Source(41, 3) + SourceIndex(0)
 ---
 >>>                    StartFindAction.prototype.getId = function () { return "yo"; };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -265,15 +266,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                               ;
 8 >                                                                                 
 9 >                                                                                 }
-1->Emitted(29, 21) Source(35, 10) + SourceIndex(0)
-2 >Emitted(29, 52) Source(35, 15) + SourceIndex(0)
-3 >Emitted(29, 55) Source(35, 3) + SourceIndex(0)
-4 >Emitted(29, 69) Source(35, 20) + SourceIndex(0)
-5 >Emitted(29, 76) Source(35, 27) + SourceIndex(0)
-6 >Emitted(29, 80) Source(35, 31) + SourceIndex(0)
-7 >Emitted(29, 81) Source(35, 32) + SourceIndex(0)
-8 >Emitted(29, 82) Source(35, 33) + SourceIndex(0)
-9 >Emitted(29, 83) Source(35, 34) + SourceIndex(0)
+1->Emitted(30, 21) Source(35, 10) + SourceIndex(0)
+2 >Emitted(30, 52) Source(35, 15) + SourceIndex(0)
+3 >Emitted(30, 55) Source(35, 3) + SourceIndex(0)
+4 >Emitted(30, 69) Source(35, 20) + SourceIndex(0)
+5 >Emitted(30, 76) Source(35, 27) + SourceIndex(0)
+6 >Emitted(30, 80) Source(35, 31) + SourceIndex(0)
+7 >Emitted(30, 81) Source(35, 32) + SourceIndex(0)
+8 >Emitted(30, 82) Source(35, 33) + SourceIndex(0)
+9 >Emitted(30, 83) Source(35, 34) + SourceIndex(0)
 ---
 >>>                    StartFindAction.prototype.run = function (Thing) {
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -288,11 +289,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                                 
 4 >                                                    public run(
 5 >                                                              Thing:Sample.Thing.ICodeThing
-1 >Emitted(30, 21) Source(37, 10) + SourceIndex(0)
-2 >Emitted(30, 50) Source(37, 13) + SourceIndex(0)
-3 >Emitted(30, 53) Source(37, 3) + SourceIndex(0)
-4 >Emitted(30, 63) Source(37, 14) + SourceIndex(0)
-5 >Emitted(30, 68) Source(37, 43) + SourceIndex(0)
+1 >Emitted(31, 21) Source(37, 10) + SourceIndex(0)
+2 >Emitted(31, 50) Source(37, 13) + SourceIndex(0)
+3 >Emitted(31, 53) Source(37, 3) + SourceIndex(0)
+4 >Emitted(31, 63) Source(37, 14) + SourceIndex(0)
+5 >Emitted(31, 68) Source(37, 43) + SourceIndex(0)
 ---
 >>>                        return true;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -305,10 +306,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                        return 
 3 >                               true
 4 >                                   ;
-1 >Emitted(31, 25) Source(39, 4) + SourceIndex(0)
-2 >Emitted(31, 32) Source(39, 11) + SourceIndex(0)
-3 >Emitted(31, 36) Source(39, 15) + SourceIndex(0)
-4 >Emitted(31, 37) Source(39, 16) + SourceIndex(0)
+1 >Emitted(32, 25) Source(39, 4) + SourceIndex(0)
+2 >Emitted(32, 32) Source(39, 11) + SourceIndex(0)
+3 >Emitted(32, 36) Source(39, 15) + SourceIndex(0)
+4 >Emitted(32, 37) Source(39, 16) + SourceIndex(0)
 ---
 >>>                    };
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -317,8 +318,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(32, 21) Source(40, 3) + SourceIndex(0)
-2 >Emitted(32, 22) Source(40, 4) + SourceIndex(0)
+1 >Emitted(33, 21) Source(40, 3) + SourceIndex(0)
+2 >Emitted(33, 22) Source(40, 4) + SourceIndex(0)
 ---
 >>>                    return StartFindAction;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -326,8 +327,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
   >	
 2 >                    }
-1->Emitted(33, 21) Source(41, 2) + SourceIndex(0)
-2 >Emitted(33, 43) Source(41, 3) + SourceIndex(0)
+1->Emitted(34, 21) Source(41, 2) + SourceIndex(0)
+2 >Emitted(34, 43) Source(41, 3) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -347,10 +348,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 			return true;
   >                 		}
   >                 	}
-1 >Emitted(34, 17) Source(41, 2) + SourceIndex(0)
-2 >Emitted(34, 18) Source(41, 3) + SourceIndex(0)
-3 >Emitted(34, 18) Source(33, 2) + SourceIndex(0)
-4 >Emitted(34, 22) Source(41, 3) + SourceIndex(0)
+1 >Emitted(35, 17) Source(41, 2) + SourceIndex(0)
+2 >Emitted(35, 18) Source(41, 3) + SourceIndex(0)
+3 >Emitted(35, 18) Source(33, 2) + SourceIndex(0)
+4 >Emitted(35, 22) Source(41, 3) + SourceIndex(0)
 ---
 >>>                Find.StartFindAction = StartFindAction;
 1->^^^^^^^^^^^^^^^^
@@ -370,10 +371,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                    		}
   >                                    	}
 4 >                                                      
-1->Emitted(35, 17) Source(33, 15) + SourceIndex(0)
-2 >Emitted(35, 37) Source(33, 30) + SourceIndex(0)
-3 >Emitted(35, 55) Source(41, 3) + SourceIndex(0)
-4 >Emitted(35, 56) Source(41, 3) + SourceIndex(0)
+1->Emitted(36, 17) Source(33, 15) + SourceIndex(0)
+2 >Emitted(36, 37) Source(33, 30) + SourceIndex(0)
+3 >Emitted(36, 55) Source(41, 3) + SourceIndex(0)
+4 >Emitted(36, 56) Source(41, 3) + SourceIndex(0)
 ---
 >>>            })(Find = Thing_1.Find || (Thing_1.Find = {}));
 1->^^^^^^^^^^^^
@@ -405,15 +406,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                   		}
   >                                                   	}
   >                                                   }
-1->Emitted(36, 13) Source(42, 1) + SourceIndex(0)
-2 >Emitted(36, 14) Source(42, 2) + SourceIndex(0)
-3 >Emitted(36, 16) Source(32, 29) + SourceIndex(0)
-4 >Emitted(36, 20) Source(32, 33) + SourceIndex(0)
-5 >Emitted(36, 23) Source(32, 29) + SourceIndex(0)
-6 >Emitted(36, 35) Source(32, 33) + SourceIndex(0)
-7 >Emitted(36, 40) Source(32, 29) + SourceIndex(0)
-8 >Emitted(36, 52) Source(32, 33) + SourceIndex(0)
-9 >Emitted(36, 60) Source(42, 2) + SourceIndex(0)
+1->Emitted(37, 13) Source(42, 1) + SourceIndex(0)
+2 >Emitted(37, 14) Source(42, 2) + SourceIndex(0)
+3 >Emitted(37, 16) Source(32, 29) + SourceIndex(0)
+4 >Emitted(37, 20) Source(32, 33) + SourceIndex(0)
+5 >Emitted(37, 23) Source(32, 29) + SourceIndex(0)
+6 >Emitted(37, 35) Source(32, 33) + SourceIndex(0)
+7 >Emitted(37, 40) Source(32, 29) + SourceIndex(0)
+8 >Emitted(37, 52) Source(32, 33) + SourceIndex(0)
+9 >Emitted(37, 60) Source(42, 2) + SourceIndex(0)
 ---
 >>>        })(Thing = Actions.Thing || (Actions.Thing = {}));
 1 >^^^^^^^^
@@ -445,15 +446,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                  		}
   >                                                  	}
   >                                                  }
-1 >Emitted(37, 9) Source(42, 1) + SourceIndex(0)
-2 >Emitted(37, 10) Source(42, 2) + SourceIndex(0)
-3 >Emitted(37, 12) Source(32, 23) + SourceIndex(0)
-4 >Emitted(37, 17) Source(32, 28) + SourceIndex(0)
-5 >Emitted(37, 20) Source(32, 23) + SourceIndex(0)
-6 >Emitted(37, 33) Source(32, 28) + SourceIndex(0)
-7 >Emitted(37, 38) Source(32, 23) + SourceIndex(0)
-8 >Emitted(37, 51) Source(32, 28) + SourceIndex(0)
-9 >Emitted(37, 59) Source(42, 2) + SourceIndex(0)
+1 >Emitted(38, 9) Source(42, 1) + SourceIndex(0)
+2 >Emitted(38, 10) Source(42, 2) + SourceIndex(0)
+3 >Emitted(38, 12) Source(32, 23) + SourceIndex(0)
+4 >Emitted(38, 17) Source(32, 28) + SourceIndex(0)
+5 >Emitted(38, 20) Source(32, 23) + SourceIndex(0)
+6 >Emitted(38, 33) Source(32, 28) + SourceIndex(0)
+7 >Emitted(38, 38) Source(32, 23) + SourceIndex(0)
+8 >Emitted(38, 51) Source(32, 28) + SourceIndex(0)
+9 >Emitted(38, 59) Source(42, 2) + SourceIndex(0)
 ---
 >>>    })(Actions = Sample.Actions || (Sample.Actions = {}));
 1->^^^^
@@ -484,15 +485,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                  		}
   >                                                  	}
   >                                                  }
-1->Emitted(38, 5) Source(42, 1) + SourceIndex(0)
-2 >Emitted(38, 6) Source(42, 2) + SourceIndex(0)
-3 >Emitted(38, 8) Source(32, 15) + SourceIndex(0)
-4 >Emitted(38, 15) Source(32, 22) + SourceIndex(0)
-5 >Emitted(38, 18) Source(32, 15) + SourceIndex(0)
-6 >Emitted(38, 32) Source(32, 22) + SourceIndex(0)
-7 >Emitted(38, 37) Source(32, 15) + SourceIndex(0)
-8 >Emitted(38, 51) Source(32, 22) + SourceIndex(0)
-9 >Emitted(38, 59) Source(42, 2) + SourceIndex(0)
+1->Emitted(39, 5) Source(42, 1) + SourceIndex(0)
+2 >Emitted(39, 6) Source(42, 2) + SourceIndex(0)
+3 >Emitted(39, 8) Source(32, 15) + SourceIndex(0)
+4 >Emitted(39, 15) Source(32, 22) + SourceIndex(0)
+5 >Emitted(39, 18) Source(32, 15) + SourceIndex(0)
+6 >Emitted(39, 32) Source(32, 22) + SourceIndex(0)
+7 >Emitted(39, 37) Source(32, 15) + SourceIndex(0)
+8 >Emitted(39, 51) Source(32, 22) + SourceIndex(0)
+9 >Emitted(39, 59) Source(42, 2) + SourceIndex(0)
 ---
 >>>})(Sample || (Sample = {}));
 1 >
@@ -519,13 +520,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    		}
   >                    	}
   >                    }
-1 >Emitted(39, 1) Source(42, 1) + SourceIndex(0)
-2 >Emitted(39, 2) Source(42, 2) + SourceIndex(0)
-3 >Emitted(39, 4) Source(32, 8) + SourceIndex(0)
-4 >Emitted(39, 10) Source(32, 14) + SourceIndex(0)
-5 >Emitted(39, 15) Source(32, 8) + SourceIndex(0)
-6 >Emitted(39, 21) Source(32, 14) + SourceIndex(0)
-7 >Emitted(39, 29) Source(42, 2) + SourceIndex(0)
+1 >Emitted(40, 1) Source(42, 1) + SourceIndex(0)
+2 >Emitted(40, 2) Source(42, 2) + SourceIndex(0)
+3 >Emitted(40, 4) Source(32, 8) + SourceIndex(0)
+4 >Emitted(40, 10) Source(32, 14) + SourceIndex(0)
+5 >Emitted(40, 15) Source(32, 8) + SourceIndex(0)
+6 >Emitted(40, 21) Source(32, 14) + SourceIndex(0)
+7 >Emitted(40, 29) Source(42, 2) + SourceIndex(0)
 ---
 >>>(function (Sample) {
 1 >
@@ -536,9 +537,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >
 2 >module 
 3 >           Sample
-1 >Emitted(40, 1) Source(44, 1) + SourceIndex(0)
-2 >Emitted(40, 12) Source(44, 8) + SourceIndex(0)
-3 >Emitted(40, 18) Source(44, 14) + SourceIndex(0)
+1 >Emitted(41, 1) Source(44, 1) + SourceIndex(0)
+2 >Emitted(41, 12) Source(44, 8) + SourceIndex(0)
+3 >Emitted(41, 18) Source(44, 14) + SourceIndex(0)
 ---
 >>>    var Thing;
 1 >^^^^
@@ -570,10 +571,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             
   >             	}
   >             }
-1 >Emitted(41, 5) Source(44, 15) + SourceIndex(0)
-2 >Emitted(41, 9) Source(44, 15) + SourceIndex(0)
-3 >Emitted(41, 14) Source(44, 20) + SourceIndex(0)
-4 >Emitted(41, 15) Source(64, 2) + SourceIndex(0)
+1 >Emitted(42, 5) Source(44, 15) + SourceIndex(0)
+2 >Emitted(42, 9) Source(44, 15) + SourceIndex(0)
+3 >Emitted(42, 14) Source(44, 20) + SourceIndex(0)
+4 >Emitted(42, 15) Source(64, 2) + SourceIndex(0)
 ---
 >>>    (function (Thing) {
 1->^^^^
@@ -583,9 +584,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Thing
-1->Emitted(42, 5) Source(44, 15) + SourceIndex(0)
-2 >Emitted(42, 16) Source(44, 15) + SourceIndex(0)
-3 >Emitted(42, 21) Source(44, 20) + SourceIndex(0)
+1->Emitted(43, 5) Source(44, 15) + SourceIndex(0)
+2 >Emitted(43, 16) Source(44, 15) + SourceIndex(0)
+3 >Emitted(43, 21) Source(44, 20) + SourceIndex(0)
 ---
 >>>        var Widgets;
 1->^^^^^^^^
@@ -617,10 +618,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                   
   >                   	}
   >                   }
-1->Emitted(43, 9) Source(44, 21) + SourceIndex(0)
-2 >Emitted(43, 13) Source(44, 21) + SourceIndex(0)
-3 >Emitted(43, 20) Source(44, 28) + SourceIndex(0)
-4 >Emitted(43, 21) Source(64, 2) + SourceIndex(0)
+1->Emitted(44, 9) Source(44, 21) + SourceIndex(0)
+2 >Emitted(44, 13) Source(44, 21) + SourceIndex(0)
+3 >Emitted(44, 20) Source(44, 28) + SourceIndex(0)
+4 >Emitted(44, 21) Source(64, 2) + SourceIndex(0)
 ---
 >>>        (function (Widgets) {
 1->^^^^^^^^
@@ -630,16 +631,16 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Widgets
-1->Emitted(44, 9) Source(44, 21) + SourceIndex(0)
-2 >Emitted(44, 20) Source(44, 21) + SourceIndex(0)
-3 >Emitted(44, 27) Source(44, 28) + SourceIndex(0)
+1->Emitted(45, 9) Source(44, 21) + SourceIndex(0)
+2 >Emitted(45, 20) Source(44, 21) + SourceIndex(0)
+3 >Emitted(45, 27) Source(44, 28) + SourceIndex(0)
 ---
 >>>            var FindWidget = /** @class */ (function () {
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >	
-1->Emitted(45, 13) Source(45, 2) + SourceIndex(0)
+1->Emitted(46, 13) Source(45, 2) + SourceIndex(0)
 ---
 >>>                function FindWidget(codeThing) {
 1->^^^^^^^^^^^^^^^^
@@ -654,9 +655,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		
 2 >                constructor(private 
 3 >                                    codeThing: Sample.Thing.ICodeThing
-1->Emitted(46, 17) Source(50, 3) + SourceIndex(0)
-2 >Emitted(46, 37) Source(50, 23) + SourceIndex(0)
-3 >Emitted(46, 46) Source(50, 57) + SourceIndex(0)
+1->Emitted(47, 17) Source(50, 3) + SourceIndex(0)
+2 >Emitted(47, 37) Source(50, 23) + SourceIndex(0)
+3 >Emitted(47, 46) Source(50, 57) + SourceIndex(0)
 ---
 >>>                    this.codeThing = codeThing;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -669,11 +670,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                  
 4 >                                     codeThing
 5 >                                              : Sample.Thing.ICodeThing
-1->Emitted(47, 21) Source(50, 23) + SourceIndex(0)
-2 >Emitted(47, 35) Source(50, 32) + SourceIndex(0)
-3 >Emitted(47, 38) Source(50, 23) + SourceIndex(0)
-4 >Emitted(47, 47) Source(50, 32) + SourceIndex(0)
-5 >Emitted(47, 48) Source(50, 57) + SourceIndex(0)
+1->Emitted(48, 21) Source(50, 23) + SourceIndex(0)
+2 >Emitted(48, 35) Source(50, 32) + SourceIndex(0)
+3 >Emitted(48, 38) Source(50, 23) + SourceIndex(0)
+4 >Emitted(48, 47) Source(50, 32) + SourceIndex(0)
+5 >Emitted(48, 48) Source(50, 57) + SourceIndex(0)
 ---
 >>>                    this.domNode = null;
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -686,11 +687,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                :any = 
 4 >                                   null
 5 >                                       ;
-1 >Emitted(48, 21) Source(49, 11) + SourceIndex(0)
-2 >Emitted(48, 33) Source(49, 18) + SourceIndex(0)
-3 >Emitted(48, 36) Source(49, 25) + SourceIndex(0)
-4 >Emitted(48, 40) Source(49, 29) + SourceIndex(0)
-5 >Emitted(48, 41) Source(49, 30) + SourceIndex(0)
+1 >Emitted(49, 21) Source(49, 11) + SourceIndex(0)
+2 >Emitted(49, 33) Source(49, 18) + SourceIndex(0)
+3 >Emitted(49, 36) Source(49, 25) + SourceIndex(0)
+4 >Emitted(49, 40) Source(49, 29) + SourceIndex(0)
+5 >Emitted(49, 41) Source(49, 30) + SourceIndex(0)
 ---
 >>>                    // scenario 1
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -700,8 +701,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >		constructor(private codeThing: Sample.Thing.ICodeThing) {
   >		    
 2 >                    // scenario 1
-1 >Emitted(49, 21) Source(51, 7) + SourceIndex(0)
-2 >Emitted(49, 34) Source(51, 20) + SourceIndex(0)
+1 >Emitted(50, 21) Source(51, 7) + SourceIndex(0)
+2 >Emitted(50, 34) Source(51, 20) + SourceIndex(0)
 ---
 >>>                    codeThing.addWidget("addWidget", this);
 1->^^^^^^^^^^^^^^^^^^^^
@@ -725,16 +726,16 @@ sourceFile:recursiveClassReferenceTest.ts
 8 >                                                     this
 9 >                                                         )
 10>                                                          ;
-1->Emitted(50, 21) Source(52, 7) + SourceIndex(0)
-2 >Emitted(50, 30) Source(52, 16) + SourceIndex(0)
-3 >Emitted(50, 31) Source(52, 17) + SourceIndex(0)
-4 >Emitted(50, 40) Source(52, 26) + SourceIndex(0)
-5 >Emitted(50, 41) Source(52, 27) + SourceIndex(0)
-6 >Emitted(50, 52) Source(52, 38) + SourceIndex(0)
-7 >Emitted(50, 54) Source(52, 40) + SourceIndex(0)
-8 >Emitted(50, 58) Source(52, 44) + SourceIndex(0)
-9 >Emitted(50, 59) Source(52, 45) + SourceIndex(0)
-10>Emitted(50, 60) Source(52, 46) + SourceIndex(0)
+1->Emitted(51, 21) Source(52, 7) + SourceIndex(0)
+2 >Emitted(51, 30) Source(52, 16) + SourceIndex(0)
+3 >Emitted(51, 31) Source(52, 17) + SourceIndex(0)
+4 >Emitted(51, 40) Source(52, 26) + SourceIndex(0)
+5 >Emitted(51, 41) Source(52, 27) + SourceIndex(0)
+6 >Emitted(51, 52) Source(52, 38) + SourceIndex(0)
+7 >Emitted(51, 54) Source(52, 40) + SourceIndex(0)
+8 >Emitted(51, 58) Source(52, 44) + SourceIndex(0)
+9 >Emitted(51, 59) Source(52, 45) + SourceIndex(0)
+10>Emitted(51, 60) Source(52, 46) + SourceIndex(0)
 ---
 >>>                }
 1 >^^^^^^^^^^^^^^^^
@@ -743,8 +744,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                }
-1 >Emitted(51, 17) Source(53, 3) + SourceIndex(0)
-2 >Emitted(51, 18) Source(53, 4) + SourceIndex(0)
+1 >Emitted(52, 17) Source(53, 3) + SourceIndex(0)
+2 >Emitted(52, 18) Source(53, 4) + SourceIndex(0)
 ---
 >>>                FindWidget.prototype.gar = function (runner) { if (true) {
 1->^^^^^^^^^^^^^^^^
@@ -765,15 +766,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                               if (
 8 >                                                                   true
 9 >                                                                       ) 
-1->Emitted(52, 17) Source(47, 10) + SourceIndex(0)
-2 >Emitted(52, 41) Source(47, 13) + SourceIndex(0)
-3 >Emitted(52, 44) Source(47, 3) + SourceIndex(0)
-4 >Emitted(52, 54) Source(47, 14) + SourceIndex(0)
-5 >Emitted(52, 60) Source(47, 55) + SourceIndex(0)
-6 >Emitted(52, 64) Source(47, 59) + SourceIndex(0)
-7 >Emitted(52, 68) Source(47, 63) + SourceIndex(0)
-8 >Emitted(52, 72) Source(47, 67) + SourceIndex(0)
-9 >Emitted(52, 74) Source(47, 69) + SourceIndex(0)
+1->Emitted(53, 17) Source(47, 10) + SourceIndex(0)
+2 >Emitted(53, 41) Source(47, 13) + SourceIndex(0)
+3 >Emitted(53, 44) Source(47, 3) + SourceIndex(0)
+4 >Emitted(53, 54) Source(47, 14) + SourceIndex(0)
+5 >Emitted(53, 60) Source(47, 55) + SourceIndex(0)
+6 >Emitted(53, 64) Source(47, 59) + SourceIndex(0)
+7 >Emitted(53, 68) Source(47, 63) + SourceIndex(0)
+8 >Emitted(53, 72) Source(47, 67) + SourceIndex(0)
+9 >Emitted(53, 74) Source(47, 69) + SourceIndex(0)
 ---
 >>>                    return runner(this);
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -790,13 +791,13 @@ sourceFile:recursiveClassReferenceTest.ts
 5 >                                  this
 6 >                                      )
 7 >                                       ;
-1 >Emitted(53, 21) Source(47, 70) + SourceIndex(0)
-2 >Emitted(53, 28) Source(47, 77) + SourceIndex(0)
-3 >Emitted(53, 34) Source(47, 83) + SourceIndex(0)
-4 >Emitted(53, 35) Source(47, 84) + SourceIndex(0)
-5 >Emitted(53, 39) Source(47, 88) + SourceIndex(0)
-6 >Emitted(53, 40) Source(47, 89) + SourceIndex(0)
-7 >Emitted(53, 41) Source(47, 90) + SourceIndex(0)
+1 >Emitted(54, 21) Source(47, 70) + SourceIndex(0)
+2 >Emitted(54, 28) Source(47, 77) + SourceIndex(0)
+3 >Emitted(54, 34) Source(47, 83) + SourceIndex(0)
+4 >Emitted(54, 35) Source(47, 84) + SourceIndex(0)
+5 >Emitted(54, 39) Source(47, 88) + SourceIndex(0)
+6 >Emitted(54, 40) Source(47, 89) + SourceIndex(0)
+7 >Emitted(54, 41) Source(47, 90) + SourceIndex(0)
 ---
 >>>                } };
 1 >^^^^^^^^^^^^^^^^^
@@ -806,9 +807,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >}
 2 >                 
 3 >                  }
-1 >Emitted(54, 18) Source(47, 91) + SourceIndex(0)
-2 >Emitted(54, 19) Source(47, 91) + SourceIndex(0)
-3 >Emitted(54, 20) Source(47, 92) + SourceIndex(0)
+1 >Emitted(55, 18) Source(47, 91) + SourceIndex(0)
+2 >Emitted(55, 19) Source(47, 91) + SourceIndex(0)
+3 >Emitted(55, 20) Source(47, 92) + SourceIndex(0)
 ---
 >>>                FindWidget.prototype.getDomNode = function () {
 1->^^^^^^^^^^^^^^^^
@@ -825,9 +826,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                getDomNode
 3 >                                               
-1->Emitted(55, 17) Source(55, 10) + SourceIndex(0)
-2 >Emitted(55, 48) Source(55, 20) + SourceIndex(0)
-3 >Emitted(55, 51) Source(55, 3) + SourceIndex(0)
+1->Emitted(56, 17) Source(55, 10) + SourceIndex(0)
+2 >Emitted(56, 48) Source(55, 20) + SourceIndex(0)
+3 >Emitted(56, 51) Source(55, 3) + SourceIndex(0)
 ---
 >>>                    return domNode;
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -839,10 +840,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                    return 
 3 >                           domNode
 4 >                                  ;
-1 >Emitted(56, 21) Source(56, 4) + SourceIndex(0)
-2 >Emitted(56, 28) Source(56, 11) + SourceIndex(0)
-3 >Emitted(56, 35) Source(56, 18) + SourceIndex(0)
-4 >Emitted(56, 36) Source(56, 19) + SourceIndex(0)
+1 >Emitted(57, 21) Source(56, 4) + SourceIndex(0)
+2 >Emitted(57, 28) Source(56, 11) + SourceIndex(0)
+3 >Emitted(57, 35) Source(56, 18) + SourceIndex(0)
+4 >Emitted(57, 36) Source(56, 19) + SourceIndex(0)
 ---
 >>>                };
 1 >^^^^^^^^^^^^^^^^
@@ -851,8 +852,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                }
-1 >Emitted(57, 17) Source(57, 3) + SourceIndex(0)
-2 >Emitted(57, 18) Source(57, 4) + SourceIndex(0)
+1 >Emitted(58, 17) Source(57, 3) + SourceIndex(0)
+2 >Emitted(58, 18) Source(57, 4) + SourceIndex(0)
 ---
 >>>                FindWidget.prototype.destroy = function () {
 1->^^^^^^^^^^^^^^^^
@@ -863,9 +864,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                destroy
 3 >                                            
-1->Emitted(58, 17) Source(59, 10) + SourceIndex(0)
-2 >Emitted(58, 45) Source(59, 17) + SourceIndex(0)
-3 >Emitted(58, 48) Source(59, 3) + SourceIndex(0)
+1->Emitted(59, 17) Source(59, 10) + SourceIndex(0)
+2 >Emitted(59, 45) Source(59, 17) + SourceIndex(0)
+3 >Emitted(59, 48) Source(59, 3) + SourceIndex(0)
 ---
 >>>                };
 1 >^^^^^^^^^^^^^^^^
@@ -875,8 +876,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >		
 2 >                }
-1 >Emitted(59, 17) Source(61, 3) + SourceIndex(0)
-2 >Emitted(59, 18) Source(61, 4) + SourceIndex(0)
+1 >Emitted(60, 17) Source(61, 3) + SourceIndex(0)
+2 >Emitted(60, 18) Source(61, 4) + SourceIndex(0)
 ---
 >>>                return FindWidget;
 1->^^^^^^^^^^^^^^^^
@@ -885,8 +886,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                }
-1->Emitted(60, 17) Source(63, 2) + SourceIndex(0)
-2 >Emitted(60, 34) Source(63, 3) + SourceIndex(0)
+1->Emitted(61, 17) Source(63, 2) + SourceIndex(0)
+2 >Emitted(61, 34) Source(63, 3) + SourceIndex(0)
 ---
 >>>            }());
 1 >^^^^^^^^^^^^
@@ -916,10 +917,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             		}
   >             
   >             	}
-1 >Emitted(61, 13) Source(63, 2) + SourceIndex(0)
-2 >Emitted(61, 14) Source(63, 3) + SourceIndex(0)
-3 >Emitted(61, 14) Source(45, 2) + SourceIndex(0)
-4 >Emitted(61, 18) Source(63, 3) + SourceIndex(0)
+1 >Emitted(62, 13) Source(63, 2) + SourceIndex(0)
+2 >Emitted(62, 14) Source(63, 3) + SourceIndex(0)
+3 >Emitted(62, 14) Source(45, 2) + SourceIndex(0)
+4 >Emitted(62, 18) Source(63, 3) + SourceIndex(0)
 ---
 >>>            Widgets.FindWidget = FindWidget;
 1->^^^^^^^^^^^^
@@ -949,10 +950,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              	}
 4 >                                           
-1->Emitted(62, 13) Source(45, 15) + SourceIndex(0)
-2 >Emitted(62, 31) Source(45, 25) + SourceIndex(0)
-3 >Emitted(62, 44) Source(63, 3) + SourceIndex(0)
-4 >Emitted(62, 45) Source(63, 3) + SourceIndex(0)
+1->Emitted(63, 13) Source(45, 15) + SourceIndex(0)
+2 >Emitted(63, 31) Source(45, 25) + SourceIndex(0)
+3 >Emitted(63, 44) Source(63, 3) + SourceIndex(0)
+4 >Emitted(63, 45) Source(63, 3) + SourceIndex(0)
 ---
 >>>        })(Widgets = Thing.Widgets || (Thing.Widgets = {}));
 1->^^^^^^^^
@@ -994,15 +995,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                    
   >                                                    	}
   >                                                    }
-1->Emitted(63, 9) Source(64, 1) + SourceIndex(0)
-2 >Emitted(63, 10) Source(64, 2) + SourceIndex(0)
-3 >Emitted(63, 12) Source(44, 21) + SourceIndex(0)
-4 >Emitted(63, 19) Source(44, 28) + SourceIndex(0)
-5 >Emitted(63, 22) Source(44, 21) + SourceIndex(0)
-6 >Emitted(63, 35) Source(44, 28) + SourceIndex(0)
-7 >Emitted(63, 40) Source(44, 21) + SourceIndex(0)
-8 >Emitted(63, 53) Source(44, 28) + SourceIndex(0)
-9 >Emitted(63, 61) Source(64, 2) + SourceIndex(0)
+1->Emitted(64, 9) Source(64, 1) + SourceIndex(0)
+2 >Emitted(64, 10) Source(64, 2) + SourceIndex(0)
+3 >Emitted(64, 12) Source(44, 21) + SourceIndex(0)
+4 >Emitted(64, 19) Source(44, 28) + SourceIndex(0)
+5 >Emitted(64, 22) Source(44, 21) + SourceIndex(0)
+6 >Emitted(64, 35) Source(44, 28) + SourceIndex(0)
+7 >Emitted(64, 40) Source(44, 21) + SourceIndex(0)
+8 >Emitted(64, 53) Source(44, 28) + SourceIndex(0)
+9 >Emitted(64, 61) Source(64, 2) + SourceIndex(0)
 ---
 >>>    })(Thing = Sample.Thing || (Sample.Thing = {}));
 1 >^^^^
@@ -1043,15 +1044,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                            
   >                                            	}
   >                                            }
-1 >Emitted(64, 5) Source(64, 1) + SourceIndex(0)
-2 >Emitted(64, 6) Source(64, 2) + SourceIndex(0)
-3 >Emitted(64, 8) Source(44, 15) + SourceIndex(0)
-4 >Emitted(64, 13) Source(44, 20) + SourceIndex(0)
-5 >Emitted(64, 16) Source(44, 15) + SourceIndex(0)
-6 >Emitted(64, 28) Source(44, 20) + SourceIndex(0)
-7 >Emitted(64, 33) Source(44, 15) + SourceIndex(0)
-8 >Emitted(64, 45) Source(44, 20) + SourceIndex(0)
-9 >Emitted(64, 53) Source(64, 2) + SourceIndex(0)
+1 >Emitted(65, 5) Source(64, 1) + SourceIndex(0)
+2 >Emitted(65, 6) Source(64, 2) + SourceIndex(0)
+3 >Emitted(65, 8) Source(44, 15) + SourceIndex(0)
+4 >Emitted(65, 13) Source(44, 20) + SourceIndex(0)
+5 >Emitted(65, 16) Source(44, 15) + SourceIndex(0)
+6 >Emitted(65, 28) Source(44, 20) + SourceIndex(0)
+7 >Emitted(65, 33) Source(44, 15) + SourceIndex(0)
+8 >Emitted(65, 45) Source(44, 20) + SourceIndex(0)
+9 >Emitted(65, 53) Source(64, 2) + SourceIndex(0)
 ---
 >>>})(Sample || (Sample = {}));
 1 >
@@ -1089,13 +1090,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    
   >                    	}
   >                    }
-1 >Emitted(65, 1) Source(64, 1) + SourceIndex(0)
-2 >Emitted(65, 2) Source(64, 2) + SourceIndex(0)
-3 >Emitted(65, 4) Source(44, 8) + SourceIndex(0)
-4 >Emitted(65, 10) Source(44, 14) + SourceIndex(0)
-5 >Emitted(65, 15) Source(44, 8) + SourceIndex(0)
-6 >Emitted(65, 21) Source(44, 14) + SourceIndex(0)
-7 >Emitted(65, 29) Source(64, 2) + SourceIndex(0)
+1 >Emitted(66, 1) Source(64, 1) + SourceIndex(0)
+2 >Emitted(66, 2) Source(64, 2) + SourceIndex(0)
+3 >Emitted(66, 4) Source(44, 8) + SourceIndex(0)
+4 >Emitted(66, 10) Source(44, 14) + SourceIndex(0)
+5 >Emitted(66, 15) Source(44, 8) + SourceIndex(0)
+6 >Emitted(66, 21) Source(44, 14) + SourceIndex(0)
+7 >Emitted(66, 29) Source(64, 2) + SourceIndex(0)
 ---
 >>>var AbstractMode = /** @class */ (function () {
 1->
@@ -1104,13 +1105,13 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >interface IMode { getInitialState(): IState;} 
   >
-1->Emitted(66, 1) Source(67, 1) + SourceIndex(0)
+1->Emitted(67, 1) Source(67, 1) + SourceIndex(0)
 ---
 >>>    function AbstractMode() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(67, 5) Source(67, 1) + SourceIndex(0)
+1->Emitted(68, 5) Source(67, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -1118,8 +1119,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->class AbstractMode implements IMode { public getInitialState(): IState { return null;} 
 2 >    }
-1->Emitted(68, 5) Source(67, 88) + SourceIndex(0)
-2 >Emitted(68, 6) Source(67, 89) + SourceIndex(0)
+1->Emitted(69, 5) Source(67, 88) + SourceIndex(0)
+2 >Emitted(69, 6) Source(67, 89) + SourceIndex(0)
 ---
 >>>    AbstractMode.prototype.getInitialState = function () { return null; };
 1->^^^^
@@ -1140,23 +1141,23 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                      ;
 8 >                                                                       
 9 >                                                                        }
-1->Emitted(69, 5) Source(67, 46) + SourceIndex(0)
-2 >Emitted(69, 43) Source(67, 61) + SourceIndex(0)
-3 >Emitted(69, 46) Source(67, 39) + SourceIndex(0)
-4 >Emitted(69, 60) Source(67, 74) + SourceIndex(0)
-5 >Emitted(69, 67) Source(67, 81) + SourceIndex(0)
-6 >Emitted(69, 71) Source(67, 85) + SourceIndex(0)
-7 >Emitted(69, 72) Source(67, 86) + SourceIndex(0)
-8 >Emitted(69, 73) Source(67, 86) + SourceIndex(0)
-9 >Emitted(69, 74) Source(67, 87) + SourceIndex(0)
+1->Emitted(70, 5) Source(67, 46) + SourceIndex(0)
+2 >Emitted(70, 43) Source(67, 61) + SourceIndex(0)
+3 >Emitted(70, 46) Source(67, 39) + SourceIndex(0)
+4 >Emitted(70, 60) Source(67, 74) + SourceIndex(0)
+5 >Emitted(70, 67) Source(67, 81) + SourceIndex(0)
+6 >Emitted(70, 71) Source(67, 85) + SourceIndex(0)
+7 >Emitted(70, 72) Source(67, 86) + SourceIndex(0)
+8 >Emitted(70, 73) Source(67, 86) + SourceIndex(0)
+9 >Emitted(70, 74) Source(67, 87) + SourceIndex(0)
 ---
 >>>    return AbstractMode;
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^
 1 > 
 2 >    }
-1 >Emitted(70, 5) Source(67, 88) + SourceIndex(0)
-2 >Emitted(70, 24) Source(67, 89) + SourceIndex(0)
+1 >Emitted(71, 5) Source(67, 88) + SourceIndex(0)
+2 >Emitted(71, 24) Source(67, 89) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -1168,10 +1169,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >}
 3 > 
 4 > class AbstractMode implements IMode { public getInitialState(): IState { return null;} }
-1 >Emitted(71, 1) Source(67, 88) + SourceIndex(0)
-2 >Emitted(71, 2) Source(67, 89) + SourceIndex(0)
-3 >Emitted(71, 2) Source(67, 1) + SourceIndex(0)
-4 >Emitted(71, 6) Source(67, 89) + SourceIndex(0)
+1 >Emitted(72, 1) Source(67, 88) + SourceIndex(0)
+2 >Emitted(72, 2) Source(67, 89) + SourceIndex(0)
+3 >Emitted(72, 2) Source(67, 1) + SourceIndex(0)
+4 >Emitted(72, 6) Source(67, 89) + SourceIndex(0)
 ---
 >>>(function (Sample) {
 1->
@@ -1189,9 +1190,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >
 2 >module 
 3 >           Sample
-1->Emitted(72, 1) Source(76, 1) + SourceIndex(0)
-2 >Emitted(72, 12) Source(76, 8) + SourceIndex(0)
-3 >Emitted(72, 18) Source(76, 14) + SourceIndex(0)
+1->Emitted(73, 1) Source(76, 1) + SourceIndex(0)
+2 >Emitted(73, 12) Source(76, 8) + SourceIndex(0)
+3 >Emitted(73, 18) Source(76, 14) + SourceIndex(0)
 ---
 >>>    var Thing;
 1 >^^^^
@@ -1227,10 +1228,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >             
   >             	}
   >             }
-1 >Emitted(73, 5) Source(76, 15) + SourceIndex(0)
-2 >Emitted(73, 9) Source(76, 15) + SourceIndex(0)
-3 >Emitted(73, 14) Source(76, 20) + SourceIndex(0)
-4 >Emitted(73, 15) Source(100, 2) + SourceIndex(0)
+1 >Emitted(74, 5) Source(76, 15) + SourceIndex(0)
+2 >Emitted(74, 9) Source(76, 15) + SourceIndex(0)
+3 >Emitted(74, 14) Source(76, 20) + SourceIndex(0)
+4 >Emitted(74, 15) Source(100, 2) + SourceIndex(0)
 ---
 >>>    (function (Thing) {
 1->^^^^
@@ -1240,9 +1241,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >    
 3 >               Thing
-1->Emitted(74, 5) Source(76, 15) + SourceIndex(0)
-2 >Emitted(74, 16) Source(76, 15) + SourceIndex(0)
-3 >Emitted(74, 21) Source(76, 20) + SourceIndex(0)
+1->Emitted(75, 5) Source(76, 15) + SourceIndex(0)
+2 >Emitted(75, 16) Source(76, 15) + SourceIndex(0)
+3 >Emitted(75, 21) Source(76, 20) + SourceIndex(0)
 ---
 >>>        var Languages;
 1->^^^^^^^^
@@ -1278,10 +1279,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                     
   >                     	}
   >                     }
-1->Emitted(75, 9) Source(76, 21) + SourceIndex(0)
-2 >Emitted(75, 13) Source(76, 21) + SourceIndex(0)
-3 >Emitted(75, 22) Source(76, 30) + SourceIndex(0)
-4 >Emitted(75, 23) Source(100, 2) + SourceIndex(0)
+1->Emitted(76, 9) Source(76, 21) + SourceIndex(0)
+2 >Emitted(76, 13) Source(76, 21) + SourceIndex(0)
+3 >Emitted(76, 22) Source(76, 30) + SourceIndex(0)
+4 >Emitted(76, 23) Source(100, 2) + SourceIndex(0)
 ---
 >>>        (function (Languages) {
 1->^^^^^^^^
@@ -1290,9 +1291,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >        
 3 >                   Languages
-1->Emitted(76, 9) Source(76, 21) + SourceIndex(0)
-2 >Emitted(76, 20) Source(76, 21) + SourceIndex(0)
-3 >Emitted(76, 29) Source(76, 30) + SourceIndex(0)
+1->Emitted(77, 9) Source(76, 21) + SourceIndex(0)
+2 >Emitted(77, 20) Source(76, 21) + SourceIndex(0)
+3 >Emitted(77, 29) Source(76, 30) + SourceIndex(0)
 ---
 >>>            var PlainText;
 1 >^^^^^^^^^^^^
@@ -1328,10 +1329,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                         
   >                         	}
   >                         }
-1 >Emitted(77, 13) Source(76, 31) + SourceIndex(0)
-2 >Emitted(77, 17) Source(76, 31) + SourceIndex(0)
-3 >Emitted(77, 26) Source(76, 40) + SourceIndex(0)
-4 >Emitted(77, 27) Source(100, 2) + SourceIndex(0)
+1 >Emitted(78, 13) Source(76, 31) + SourceIndex(0)
+2 >Emitted(78, 17) Source(76, 31) + SourceIndex(0)
+3 >Emitted(78, 26) Source(76, 40) + SourceIndex(0)
+4 >Emitted(78, 27) Source(100, 2) + SourceIndex(0)
 ---
 >>>            (function (PlainText) {
 1->^^^^^^^^^^^^
@@ -1341,9 +1342,9 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
 2 >            
 3 >                       PlainText
-1->Emitted(78, 13) Source(76, 31) + SourceIndex(0)
-2 >Emitted(78, 24) Source(76, 31) + SourceIndex(0)
-3 >Emitted(78, 33) Source(76, 40) + SourceIndex(0)
+1->Emitted(79, 13) Source(76, 31) + SourceIndex(0)
+2 >Emitted(79, 24) Source(76, 31) + SourceIndex(0)
+3 >Emitted(79, 33) Source(76, 40) + SourceIndex(0)
 ---
 >>>                var State = /** @class */ (function () {
 1->^^^^^^^^^^^^^^^^
@@ -1351,7 +1352,7 @@ sourceFile:recursiveClassReferenceTest.ts
 1-> {
   >	
   >	
-1->Emitted(79, 17) Source(78, 2) + SourceIndex(0)
+1->Emitted(80, 17) Source(78, 2) + SourceIndex(0)
 ---
 >>>                    function State(mode) {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1362,9 +1363,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >        
 2 >                    constructor(private 
 3 >                                   mode: IMode
-1->Emitted(80, 21) Source(79, 9) + SourceIndex(0)
-2 >Emitted(80, 36) Source(79, 29) + SourceIndex(0)
-3 >Emitted(80, 40) Source(79, 40) + SourceIndex(0)
+1->Emitted(81, 21) Source(79, 9) + SourceIndex(0)
+2 >Emitted(81, 36) Source(79, 29) + SourceIndex(0)
+3 >Emitted(81, 40) Source(79, 40) + SourceIndex(0)
 ---
 >>>                        this.mode = mode;
 1->^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1377,11 +1378,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                 
 4 >                                    mode
 5 >                                        : IMode
-1->Emitted(81, 25) Source(79, 29) + SourceIndex(0)
-2 >Emitted(81, 34) Source(79, 33) + SourceIndex(0)
-3 >Emitted(81, 37) Source(79, 29) + SourceIndex(0)
-4 >Emitted(81, 41) Source(79, 33) + SourceIndex(0)
-5 >Emitted(81, 42) Source(79, 40) + SourceIndex(0)
+1->Emitted(82, 25) Source(79, 29) + SourceIndex(0)
+2 >Emitted(82, 34) Source(79, 33) + SourceIndex(0)
+3 >Emitted(82, 37) Source(79, 29) + SourceIndex(0)
+4 >Emitted(82, 41) Source(79, 33) + SourceIndex(0)
+5 >Emitted(82, 42) Source(79, 40) + SourceIndex(0)
 ---
 >>>                    }
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1389,8 +1390,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >) { 
 2 >                    }
-1 >Emitted(82, 21) Source(79, 44) + SourceIndex(0)
-2 >Emitted(82, 22) Source(79, 45) + SourceIndex(0)
+1 >Emitted(83, 21) Source(79, 44) + SourceIndex(0)
+2 >Emitted(83, 22) Source(79, 45) + SourceIndex(0)
 ---
 >>>                    State.prototype.clone = function () {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1400,9 +1401,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                    clone
 3 >                                         
-1->Emitted(83, 21) Source(80, 10) + SourceIndex(0)
-2 >Emitted(83, 42) Source(80, 15) + SourceIndex(0)
-3 >Emitted(83, 45) Source(80, 3) + SourceIndex(0)
+1->Emitted(84, 21) Source(80, 10) + SourceIndex(0)
+2 >Emitted(84, 42) Source(80, 15) + SourceIndex(0)
+3 >Emitted(84, 45) Source(80, 3) + SourceIndex(0)
 ---
 >>>                        return this;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1414,10 +1415,10 @@ sourceFile:recursiveClassReferenceTest.ts
 2 >                        return 
 3 >                               this
 4 >                                   ;
-1 >Emitted(84, 25) Source(81, 4) + SourceIndex(0)
-2 >Emitted(84, 32) Source(81, 11) + SourceIndex(0)
-3 >Emitted(84, 36) Source(81, 15) + SourceIndex(0)
-4 >Emitted(84, 37) Source(81, 16) + SourceIndex(0)
+1 >Emitted(85, 25) Source(81, 4) + SourceIndex(0)
+2 >Emitted(85, 32) Source(81, 11) + SourceIndex(0)
+3 >Emitted(85, 36) Source(81, 15) + SourceIndex(0)
+4 >Emitted(85, 37) Source(81, 16) + SourceIndex(0)
 ---
 >>>                    };
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1426,8 +1427,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(85, 21) Source(82, 3) + SourceIndex(0)
-2 >Emitted(85, 22) Source(82, 4) + SourceIndex(0)
+1 >Emitted(86, 21) Source(82, 3) + SourceIndex(0)
+2 >Emitted(86, 22) Source(82, 4) + SourceIndex(0)
 ---
 >>>                    State.prototype.equals = function (other) {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1442,11 +1443,11 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                          
 4 >                                             public equals(
 5 >                                                       other:IState
-1->Emitted(86, 21) Source(84, 10) + SourceIndex(0)
-2 >Emitted(86, 43) Source(84, 16) + SourceIndex(0)
-3 >Emitted(86, 46) Source(84, 3) + SourceIndex(0)
-4 >Emitted(86, 56) Source(84, 17) + SourceIndex(0)
-5 >Emitted(86, 61) Source(84, 29) + SourceIndex(0)
+1->Emitted(87, 21) Source(84, 10) + SourceIndex(0)
+2 >Emitted(87, 43) Source(84, 16) + SourceIndex(0)
+3 >Emitted(87, 46) Source(84, 3) + SourceIndex(0)
+4 >Emitted(87, 56) Source(84, 17) + SourceIndex(0)
+5 >Emitted(87, 61) Source(84, 29) + SourceIndex(0)
 ---
 >>>                        return this === other;
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1462,12 +1463,12 @@ sourceFile:recursiveClassReferenceTest.ts
 4 >                                    === 
 5 >                                        other
 6 >                                             ;
-1 >Emitted(87, 25) Source(85, 4) + SourceIndex(0)
-2 >Emitted(87, 32) Source(85, 11) + SourceIndex(0)
-3 >Emitted(87, 36) Source(85, 15) + SourceIndex(0)
-4 >Emitted(87, 41) Source(85, 20) + SourceIndex(0)
-5 >Emitted(87, 46) Source(85, 25) + SourceIndex(0)
-6 >Emitted(87, 47) Source(85, 26) + SourceIndex(0)
+1 >Emitted(88, 25) Source(85, 4) + SourceIndex(0)
+2 >Emitted(88, 32) Source(85, 11) + SourceIndex(0)
+3 >Emitted(88, 36) Source(85, 15) + SourceIndex(0)
+4 >Emitted(88, 41) Source(85, 20) + SourceIndex(0)
+5 >Emitted(88, 46) Source(85, 25) + SourceIndex(0)
+6 >Emitted(88, 47) Source(85, 26) + SourceIndex(0)
 ---
 >>>                    };
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1476,8 +1477,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(88, 21) Source(86, 3) + SourceIndex(0)
-2 >Emitted(88, 22) Source(86, 4) + SourceIndex(0)
+1 >Emitted(89, 21) Source(86, 3) + SourceIndex(0)
+2 >Emitted(89, 22) Source(86, 4) + SourceIndex(0)
 ---
 >>>                    State.prototype.getMode = function () { return mode; };
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1500,15 +1501,15 @@ sourceFile:recursiveClassReferenceTest.ts
 7 >                                                                       ;
 8 >                                                                         
 9 >                                                                         }
-1->Emitted(89, 21) Source(88, 10) + SourceIndex(0)
-2 >Emitted(89, 44) Source(88, 17) + SourceIndex(0)
-3 >Emitted(89, 47) Source(88, 3) + SourceIndex(0)
-4 >Emitted(89, 61) Source(88, 29) + SourceIndex(0)
-5 >Emitted(89, 68) Source(88, 36) + SourceIndex(0)
-6 >Emitted(89, 72) Source(88, 40) + SourceIndex(0)
-7 >Emitted(89, 73) Source(88, 41) + SourceIndex(0)
-8 >Emitted(89, 74) Source(88, 42) + SourceIndex(0)
-9 >Emitted(89, 75) Source(88, 43) + SourceIndex(0)
+1->Emitted(90, 21) Source(88, 10) + SourceIndex(0)
+2 >Emitted(90, 44) Source(88, 17) + SourceIndex(0)
+3 >Emitted(90, 47) Source(88, 3) + SourceIndex(0)
+4 >Emitted(90, 61) Source(88, 29) + SourceIndex(0)
+5 >Emitted(90, 68) Source(88, 36) + SourceIndex(0)
+6 >Emitted(90, 72) Source(88, 40) + SourceIndex(0)
+7 >Emitted(90, 73) Source(88, 41) + SourceIndex(0)
+8 >Emitted(90, 74) Source(88, 42) + SourceIndex(0)
+9 >Emitted(90, 75) Source(88, 43) + SourceIndex(0)
 ---
 >>>                    return State;
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1516,8 +1517,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >	
 2 >                    }
-1 >Emitted(90, 21) Source(89, 2) + SourceIndex(0)
-2 >Emitted(90, 33) Source(89, 3) + SourceIndex(0)
+1 >Emitted(91, 21) Source(89, 2) + SourceIndex(0)
+2 >Emitted(91, 33) Source(89, 3) + SourceIndex(0)
 ---
 >>>                }());
 1 >^^^^^^^^^^^^^^^^
@@ -1540,10 +1541,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                 		
   >                 		public getMode(): IMode { return mode; }
   >                 	}
-1 >Emitted(91, 17) Source(89, 2) + SourceIndex(0)
-2 >Emitted(91, 18) Source(89, 3) + SourceIndex(0)
-3 >Emitted(91, 18) Source(78, 2) + SourceIndex(0)
-4 >Emitted(91, 22) Source(89, 3) + SourceIndex(0)
+1 >Emitted(92, 17) Source(89, 2) + SourceIndex(0)
+2 >Emitted(92, 18) Source(89, 3) + SourceIndex(0)
+3 >Emitted(92, 18) Source(78, 2) + SourceIndex(0)
+4 >Emitted(92, 22) Source(89, 3) + SourceIndex(0)
 ---
 >>>                PlainText.State = State;
 1->^^^^^^^^^^^^^^^^
@@ -1566,10 +1567,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                               		public getMode(): IMode { return mode; }
   >                               	}
 4 >                                       
-1->Emitted(92, 17) Source(78, 15) + SourceIndex(0)
-2 >Emitted(92, 32) Source(78, 20) + SourceIndex(0)
-3 >Emitted(92, 40) Source(89, 3) + SourceIndex(0)
-4 >Emitted(92, 41) Source(89, 3) + SourceIndex(0)
+1->Emitted(93, 17) Source(78, 15) + SourceIndex(0)
+2 >Emitted(93, 32) Source(78, 20) + SourceIndex(0)
+3 >Emitted(93, 40) Source(89, 3) + SourceIndex(0)
+4 >Emitted(93, 41) Source(89, 3) + SourceIndex(0)
 ---
 >>>                var Mode = /** @class */ (function (_super) {
 1->^^^^^^^^^^^^^^^^
@@ -1577,21 +1578,21 @@ sourceFile:recursiveClassReferenceTest.ts
 1->
   >	
   >	
-1->Emitted(93, 17) Source(91, 2) + SourceIndex(0)
+1->Emitted(94, 17) Source(91, 2) + SourceIndex(0)
 ---
 >>>                    __extends(Mode, _super);
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^^^^^^^^^^^^
 1->export class Mode extends 
 2 >                    AbstractMode
-1->Emitted(94, 21) Source(91, 28) + SourceIndex(0)
-2 >Emitted(94, 45) Source(91, 40) + SourceIndex(0)
+1->Emitted(95, 21) Source(91, 28) + SourceIndex(0)
+2 >Emitted(95, 45) Source(91, 40) + SourceIndex(0)
 ---
 >>>                    function Mode() {
 1 >^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(95, 21) Source(91, 2) + SourceIndex(0)
+1 >Emitted(96, 21) Source(91, 2) + SourceIndex(0)
 ---
 >>>                        return _super !== null && _super.apply(this, arguments) || this;
 >>>                    }
@@ -1608,8 +1609,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                    }
-1->Emitted(97, 21) Source(99, 2) + SourceIndex(0)
-2 >Emitted(97, 22) Source(99, 3) + SourceIndex(0)
+1->Emitted(98, 21) Source(99, 2) + SourceIndex(0)
+2 >Emitted(98, 22) Source(99, 3) + SourceIndex(0)
 ---
 >>>                    // scenario 2
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1617,8 +1618,8 @@ sourceFile:recursiveClassReferenceTest.ts
 3 >                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >                    // scenario 2
-1->Emitted(98, 21) Source(93, 3) + SourceIndex(0)
-2 >Emitted(98, 34) Source(93, 16) + SourceIndex(0)
+1->Emitted(99, 21) Source(93, 3) + SourceIndex(0)
+2 >Emitted(99, 34) Source(93, 16) + SourceIndex(0)
 ---
 >>>                    Mode.prototype.getInitialState = function () {
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1628,9 +1629,9 @@ sourceFile:recursiveClassReferenceTest.ts
   >		public 
 2 >                    getInitialState
 3 >                                                  
-1->Emitted(99, 21) Source(94, 10) + SourceIndex(0)
-2 >Emitted(99, 51) Source(94, 25) + SourceIndex(0)
-3 >Emitted(99, 54) Source(94, 3) + SourceIndex(0)
+1->Emitted(100, 21) Source(94, 10) + SourceIndex(0)
+2 >Emitted(100, 51) Source(94, 25) + SourceIndex(0)
+3 >Emitted(100, 54) Source(94, 3) + SourceIndex(0)
 ---
 >>>                        return new State(self);
 1 >^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1650,14 +1651,14 @@ sourceFile:recursiveClassReferenceTest.ts
 6 >                                         self
 7 >                                             )
 8 >                                              ;
-1 >Emitted(100, 25) Source(95, 4) + SourceIndex(0)
-2 >Emitted(100, 32) Source(95, 11) + SourceIndex(0)
-3 >Emitted(100, 36) Source(95, 15) + SourceIndex(0)
-4 >Emitted(100, 41) Source(95, 20) + SourceIndex(0)
-5 >Emitted(100, 42) Source(95, 21) + SourceIndex(0)
-6 >Emitted(100, 46) Source(95, 25) + SourceIndex(0)
-7 >Emitted(100, 47) Source(95, 26) + SourceIndex(0)
-8 >Emitted(100, 48) Source(95, 27) + SourceIndex(0)
+1 >Emitted(101, 25) Source(95, 4) + SourceIndex(0)
+2 >Emitted(101, 32) Source(95, 11) + SourceIndex(0)
+3 >Emitted(101, 36) Source(95, 15) + SourceIndex(0)
+4 >Emitted(101, 41) Source(95, 20) + SourceIndex(0)
+5 >Emitted(101, 42) Source(95, 21) + SourceIndex(0)
+6 >Emitted(101, 46) Source(95, 25) + SourceIndex(0)
+7 >Emitted(101, 47) Source(95, 26) + SourceIndex(0)
+8 >Emitted(101, 48) Source(95, 27) + SourceIndex(0)
 ---
 >>>                    };
 1 >^^^^^^^^^^^^^^^^^^^^
@@ -1666,8 +1667,8 @@ sourceFile:recursiveClassReferenceTest.ts
 1 >
   >		
 2 >                    }
-1 >Emitted(101, 21) Source(96, 3) + SourceIndex(0)
-2 >Emitted(101, 22) Source(96, 4) + SourceIndex(0)
+1 >Emitted(102, 21) Source(96, 3) + SourceIndex(0)
+2 >Emitted(102, 22) Source(96, 4) + SourceIndex(0)
 ---
 >>>                    return Mode;
 1->^^^^^^^^^^^^^^^^^^^^
@@ -1678,8 +1679,8 @@ sourceFile:recursiveClassReferenceTest.ts
   >
   >	
 2 >                    }
-1->Emitted(102, 21) Source(99, 2) + SourceIndex(0)
-2 >Emitted(102, 32) Source(99, 3) + SourceIndex(0)
+1->Emitted(103, 21) Source(99, 2) + SourceIndex(0)
+2 >Emitted(103, 32) Source(99, 3) + SourceIndex(0)
 ---
 >>>                }(AbstractMode));
 1->^^^^^^^^^^^^^^^^
@@ -1703,12 +1704,12 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              
   >                              	}
-1->Emitted(103, 17) Source(99, 2) + SourceIndex(0)
-2 >Emitted(103, 18) Source(99, 3) + SourceIndex(0)
-3 >Emitted(103, 18) Source(91, 2) + SourceIndex(0)
-4 >Emitted(103, 19) Source(91, 28) + SourceIndex(0)
-5 >Emitted(103, 31) Source(91, 40) + SourceIndex(0)
-6 >Emitted(103, 34) Source(99, 3) + SourceIndex(0)
+1->Emitted(104, 17) Source(99, 2) + SourceIndex(0)
+2 >Emitted(104, 18) Source(99, 3) + SourceIndex(0)
+3 >Emitted(104, 18) Source(91, 2) + SourceIndex(0)
+4 >Emitted(104, 19) Source(91, 28) + SourceIndex(0)
+5 >Emitted(104, 31) Source(91, 40) + SourceIndex(0)
+6 >Emitted(104, 34) Source(99, 3) + SourceIndex(0)
 ---
 >>>                PlainText.Mode = Mode;
 1->^^^^^^^^^^^^^^^^
@@ -1728,10 +1729,10 @@ sourceFile:recursiveClassReferenceTest.ts
   >                              
   >                              	}
 4 >                                     
-1->Emitted(104, 17) Source(91, 15) + SourceIndex(0)
-2 >Emitted(104, 31) Source(91, 19) + SourceIndex(0)
-3 >Emitted(104, 38) Source(99, 3) + SourceIndex(0)
-4 >Emitted(104, 39) Source(99, 3) + SourceIndex(0)
+1->Emitted(105, 17) Source(91, 15) + SourceIndex(0)
+2 >Emitted(105, 31) Source(91, 19) + SourceIndex(0)
+3 >Emitted(105, 38) Source(99, 3) + SourceIndex(0)
+4 >Emitted(105, 39) Source(99, 3) + SourceIndex(0)
 ---
 >>>            })(PlainText = Languages.PlainText || (Languages.PlainText = {}));
 1->^^^^^^^^^^^^
@@ -1777,15 +1778,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                                      
   >                                                                      	}
   >                                                                      }
-1->Emitted(105, 13) Source(100, 1) + SourceIndex(0)
-2 >Emitted(105, 14) Source(100, 2) + SourceIndex(0)
-3 >Emitted(105, 16) Source(76, 31) + SourceIndex(0)
-4 >Emitted(105, 25) Source(76, 40) + SourceIndex(0)
-5 >Emitted(105, 28) Source(76, 31) + SourceIndex(0)
-6 >Emitted(105, 47) Source(76, 40) + SourceIndex(0)
-7 >Emitted(105, 52) Source(76, 31) + SourceIndex(0)
-8 >Emitted(105, 71) Source(76, 40) + SourceIndex(0)
-9 >Emitted(105, 79) Source(100, 2) + SourceIndex(0)
+1->Emitted(106, 13) Source(100, 1) + SourceIndex(0)
+2 >Emitted(106, 14) Source(100, 2) + SourceIndex(0)
+3 >Emitted(106, 16) Source(76, 31) + SourceIndex(0)
+4 >Emitted(106, 25) Source(76, 40) + SourceIndex(0)
+5 >Emitted(106, 28) Source(76, 31) + SourceIndex(0)
+6 >Emitted(106, 47) Source(76, 40) + SourceIndex(0)
+7 >Emitted(106, 52) Source(76, 31) + SourceIndex(0)
+8 >Emitted(106, 71) Source(76, 40) + SourceIndex(0)
+9 >Emitted(106, 79) Source(100, 2) + SourceIndex(0)
 ---
 >>>        })(Languages = Thing.Languages || (Thing.Languages = {}));
 1 >^^^^^^^^
@@ -1830,15 +1831,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                                          
   >                                                          	}
   >                                                          }
-1 >Emitted(106, 9) Source(100, 1) + SourceIndex(0)
-2 >Emitted(106, 10) Source(100, 2) + SourceIndex(0)
-3 >Emitted(106, 12) Source(76, 21) + SourceIndex(0)
-4 >Emitted(106, 21) Source(76, 30) + SourceIndex(0)
-5 >Emitted(106, 24) Source(76, 21) + SourceIndex(0)
-6 >Emitted(106, 39) Source(76, 30) + SourceIndex(0)
-7 >Emitted(106, 44) Source(76, 21) + SourceIndex(0)
-8 >Emitted(106, 59) Source(76, 30) + SourceIndex(0)
-9 >Emitted(106, 67) Source(100, 2) + SourceIndex(0)
+1 >Emitted(107, 9) Source(100, 1) + SourceIndex(0)
+2 >Emitted(107, 10) Source(100, 2) + SourceIndex(0)
+3 >Emitted(107, 12) Source(76, 21) + SourceIndex(0)
+4 >Emitted(107, 21) Source(76, 30) + SourceIndex(0)
+5 >Emitted(107, 24) Source(76, 21) + SourceIndex(0)
+6 >Emitted(107, 39) Source(76, 30) + SourceIndex(0)
+7 >Emitted(107, 44) Source(76, 21) + SourceIndex(0)
+8 >Emitted(107, 59) Source(76, 30) + SourceIndex(0)
+9 >Emitted(107, 67) Source(100, 2) + SourceIndex(0)
 ---
 >>>    })(Thing = Sample.Thing || (Sample.Thing = {}));
 1 >^^^^
@@ -1883,15 +1884,15 @@ sourceFile:recursiveClassReferenceTest.ts
   >                                            
   >                                            	}
   >                                            }
-1 >Emitted(107, 5) Source(100, 1) + SourceIndex(0)
-2 >Emitted(107, 6) Source(100, 2) + SourceIndex(0)
-3 >Emitted(107, 8) Source(76, 15) + SourceIndex(0)
-4 >Emitted(107, 13) Source(76, 20) + SourceIndex(0)
-5 >Emitted(107, 16) Source(76, 15) + SourceIndex(0)
-6 >Emitted(107, 28) Source(76, 20) + SourceIndex(0)
-7 >Emitted(107, 33) Source(76, 15) + SourceIndex(0)
-8 >Emitted(107, 45) Source(76, 20) + SourceIndex(0)
-9 >Emitted(107, 53) Source(100, 2) + SourceIndex(0)
+1 >Emitted(108, 5) Source(100, 1) + SourceIndex(0)
+2 >Emitted(108, 6) Source(100, 2) + SourceIndex(0)
+3 >Emitted(108, 8) Source(76, 15) + SourceIndex(0)
+4 >Emitted(108, 13) Source(76, 20) + SourceIndex(0)
+5 >Emitted(108, 16) Source(76, 15) + SourceIndex(0)
+6 >Emitted(108, 28) Source(76, 20) + SourceIndex(0)
+7 >Emitted(108, 33) Source(76, 15) + SourceIndex(0)
+8 >Emitted(108, 45) Source(76, 20) + SourceIndex(0)
+9 >Emitted(108, 53) Source(100, 2) + SourceIndex(0)
 ---
 >>>})(Sample || (Sample = {}));
 1 >
@@ -1933,12 +1934,12 @@ sourceFile:recursiveClassReferenceTest.ts
   >                    
   >                    	}
   >                    }
-1 >Emitted(108, 1) Source(100, 1) + SourceIndex(0)
-2 >Emitted(108, 2) Source(100, 2) + SourceIndex(0)
-3 >Emitted(108, 4) Source(76, 8) + SourceIndex(0)
-4 >Emitted(108, 10) Source(76, 14) + SourceIndex(0)
-5 >Emitted(108, 15) Source(76, 8) + SourceIndex(0)
-6 >Emitted(108, 21) Source(76, 14) + SourceIndex(0)
-7 >Emitted(108, 29) Source(100, 2) + SourceIndex(0)
+1 >Emitted(109, 1) Source(100, 1) + SourceIndex(0)
+2 >Emitted(109, 2) Source(100, 2) + SourceIndex(0)
+3 >Emitted(109, 4) Source(76, 8) + SourceIndex(0)
+4 >Emitted(109, 10) Source(76, 14) + SourceIndex(0)
+5 >Emitted(109, 15) Source(76, 8) + SourceIndex(0)
+6 >Emitted(109, 21) Source(76, 14) + SourceIndex(0)
+7 >Emitted(109, 29) Source(100, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=recursiveClassReferenceTest.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveComplicatedClasses.js b/tests/baselines/reference/recursiveComplicatedClasses.js
index 2522ca4b0d2..40f1639a939 100644
--- a/tests/baselines/reference/recursiveComplicatedClasses.js
+++ b/tests/baselines/reference/recursiveComplicatedClasses.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
index c6b2ea0035d..dd14ea1a9d1 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
@@ -38,8 +38,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/reexportClassDefinition.js b/tests/baselines/reference/reexportClassDefinition.js
index a85b9ffab0c..8328751cd86 100644
--- a/tests/baselines/reference/reexportClassDefinition.js
+++ b/tests/baselines/reference/reexportClassDefinition.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/reexportDefaultIsCallable.js b/tests/baselines/reference/reexportDefaultIsCallable.js
index 5cc4b488403..7e5a2a8bf5b 100644
--- a/tests/baselines/reference/reexportDefaultIsCallable.js
+++ b/tests/baselines/reference/reexportDefaultIsCallable.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/reexportedMissingAlias.js b/tests/baselines/reference/reexportedMissingAlias.js
index 208319f09c3..31cb28a6533 100644
--- a/tests/baselines/reference/reexportedMissingAlias.js
+++ b/tests/baselines/reference/reexportedMissingAlias.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
index 597a579bd24..b50b355ae09 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
@@ -1028,8 +1028,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/returnInConstructor1.js b/tests/baselines/reference/returnInConstructor1.js
index 463699011fc..9f877e88132 100644
--- a/tests/baselines/reference/returnInConstructor1.js
+++ b/tests/baselines/reference/returnInConstructor1.js
@@ -75,8 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/returnStatements.js b/tests/baselines/reference/returnStatements.js
index a680fafa9a2..c0631fd81ca 100644
--- a/tests/baselines/reference/returnStatements.js
+++ b/tests/baselines/reference/returnStatements.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
index e5571e7464c..6b81f995977 100644
--- a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
+++ b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js b/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
index f78000a85a2..56737a58b50 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsidePublicMethod2.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js b/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
index cd34e4f0fab..3272f2911f0 100644
--- a/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
+++ b/tests/baselines/reference/scopeCheckExtendedClassInsideStaticMethod1.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/scopeTests.js b/tests/baselines/reference/scopeTests.js
index c9b87d76832..77635c5db9f 100644
--- a/tests/baselines/reference/scopeTests.js
+++ b/tests/baselines/reference/scopeTests.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/shadowPrivateMembers.js b/tests/baselines/reference/shadowPrivateMembers.js
index 0d217106264..0c70690dac3 100644
--- a/tests/baselines/reference/shadowPrivateMembers.js
+++ b/tests/baselines/reference/shadowPrivateMembers.js
@@ -12,8 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
index d93cac3514f..4e63f2b4b35 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
index 02fcbdc9341..9d4bd460dbb 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;QAAA,qEAGC;QAFU,OAAC,GAAG,EAAE,CAAC;QACP,WAAK,GAAG,KAAK,CAAC;;IACzB,CAAC;IAAD,cAAC;AAAD,CAAC,AAHD,CAAsB,eAAe,GAGpC"}
\ 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;QAAA,qEAGC;QAFU,OAAC,GAAG,EAAE,CAAC;QACP,WAAK,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 338b47d1d21..6d0938a5750 100644
--- a/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
+++ b/tests/baselines/reference/sourceMapValidationClassWithDefaultConstructorAndExtendsClause.sourcemap.txt
@@ -16,8 +16,9 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 >>>        return extendStatics(d, b);
 >>>    };
 >>>    return function (d, b) {
->>>        if (typeof b !== "function" && b !== null)
+>>>        if (typeof b !== "function" && b !== null) {
 >>>            throw new TypeError("Class extends value " + b + " is not a constructor or null");
+>>>        }
 >>>        extendStatics(d, b);
 >>>        function __() { this.constructor = d; }
 >>>        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -27,13 +28,13 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(16, 1) Source(1, 1) + SourceIndex(0)
+1 >Emitted(17, 1) Source(1, 1) + SourceIndex(0)
 ---
 >>>    function AbstractGreeter() {
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(17, 5) Source(1, 1) + SourceIndex(0)
+1->Emitted(18, 5) Source(1, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -42,16 +43,16 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1->class AbstractGreeter {
   >
 2 >    }
-1->Emitted(18, 5) Source(2, 1) + SourceIndex(0)
-2 >Emitted(18, 6) Source(2, 2) + SourceIndex(0)
+1->Emitted(19, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(19, 6) Source(2, 2) + SourceIndex(0)
 ---
 >>>    return AbstractGreeter;
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(19, 5) Source(2, 1) + SourceIndex(0)
-2 >Emitted(19, 27) Source(2, 2) + SourceIndex(0)
+1->Emitted(20, 5) Source(2, 1) + SourceIndex(0)
+2 >Emitted(20, 27) Source(2, 2) + SourceIndex(0)
 ---
 >>>}());
 1 >
@@ -64,10 +65,10 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 > 
 4 > class AbstractGreeter {
   > }
-1 >Emitted(20, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(20, 2) Source(2, 2) + SourceIndex(0)
-3 >Emitted(20, 2) Source(1, 1) + SourceIndex(0)
-4 >Emitted(20, 6) Source(2, 2) + SourceIndex(0)
+1 >Emitted(21, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(21, 2) Source(2, 2) + SourceIndex(0)
+3 >Emitted(21, 2) Source(1, 1) + SourceIndex(0)
+4 >Emitted(21, 6) Source(2, 2) + SourceIndex(0)
 ---
 >>>var Greeter = /** @class */ (function (_super) {
 1->
@@ -75,21 +76,21 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1->
   >
   >
-1->Emitted(21, 1) Source(4, 1) + SourceIndex(0)
+1->Emitted(22, 1) Source(4, 1) + SourceIndex(0)
 ---
 >>>    __extends(Greeter, _super);
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->class Greeter extends 
 2 >    AbstractGreeter
-1->Emitted(22, 5) Source(4, 23) + SourceIndex(0)
-2 >Emitted(22, 32) Source(4, 38) + SourceIndex(0)
+1->Emitted(23, 5) Source(4, 23) + SourceIndex(0)
+2 >Emitted(23, 32) Source(4, 38) + SourceIndex(0)
 ---
 >>>    function Greeter() {
 1 >^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(23, 5) Source(4, 1) + SourceIndex(0)
+1 >Emitted(24, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>        var _this = _super !== null && _super.apply(this, arguments) || this;
 1->^^^^^^^^
@@ -99,8 +100,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
   >            public a = 10;
   >            public nameA = "Ten";
   >        }
-1->Emitted(24, 9) Source(4, 1) + SourceIndex(0)
-2 >Emitted(24, 78) Source(7, 2) + SourceIndex(0)
+1->Emitted(25, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(25, 78) Source(7, 2) + SourceIndex(0)
 ---
 >>>        _this.a = 10;
 1 >^^^^^^^^
@@ -114,11 +115,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                = 
 4 >                  10
 5 >                    ;
-1 >Emitted(25, 9) Source(5, 12) + SourceIndex(0)
-2 >Emitted(25, 16) Source(5, 13) + SourceIndex(0)
-3 >Emitted(25, 19) Source(5, 16) + SourceIndex(0)
-4 >Emitted(25, 21) Source(5, 18) + SourceIndex(0)
-5 >Emitted(25, 22) Source(5, 19) + SourceIndex(0)
+1 >Emitted(26, 9) Source(5, 12) + SourceIndex(0)
+2 >Emitted(26, 16) Source(5, 13) + SourceIndex(0)
+3 >Emitted(26, 19) Source(5, 16) + SourceIndex(0)
+4 >Emitted(26, 21) Source(5, 18) + SourceIndex(0)
+5 >Emitted(26, 22) Source(5, 19) + SourceIndex(0)
 ---
 >>>        _this.nameA = "Ten";
 1->^^^^^^^^
@@ -132,11 +133,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                    = 
 4 >                      "Ten"
 5 >                           ;
-1->Emitted(26, 9) Source(6, 12) + SourceIndex(0)
-2 >Emitted(26, 20) Source(6, 17) + SourceIndex(0)
-3 >Emitted(26, 23) Source(6, 20) + SourceIndex(0)
-4 >Emitted(26, 28) Source(6, 25) + SourceIndex(0)
-5 >Emitted(26, 29) Source(6, 26) + SourceIndex(0)
+1->Emitted(27, 9) Source(6, 12) + SourceIndex(0)
+2 >Emitted(27, 20) Source(6, 17) + SourceIndex(0)
+3 >Emitted(27, 23) Source(6, 20) + SourceIndex(0)
+4 >Emitted(27, 28) Source(6, 25) + SourceIndex(0)
+5 >Emitted(27, 29) Source(6, 26) + SourceIndex(0)
 ---
 >>>        return _this;
 >>>    }
@@ -146,8 +147,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 1 >
   >
 2 >    }
-1 >Emitted(28, 5) Source(7, 1) + SourceIndex(0)
-2 >Emitted(28, 6) Source(7, 2) + SourceIndex(0)
+1 >Emitted(29, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(29, 6) Source(7, 2) + SourceIndex(0)
 ---
 >>>    return Greeter;
 1->^^^^
@@ -155,8 +156,8 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
 3 >                  ^^^->
 1->
 2 >    }
-1->Emitted(29, 5) Source(7, 1) + SourceIndex(0)
-2 >Emitted(29, 19) Source(7, 2) + SourceIndex(0)
+1->Emitted(30, 5) Source(7, 1) + SourceIndex(0)
+2 >Emitted(30, 19) Source(7, 2) + SourceIndex(0)
 ---
 >>>}(AbstractGreeter));
 1->
@@ -175,11 +176,11 @@ sourceFile:sourceMapValidationClassWithDefaultConstructorAndExtendsClause.ts
   >                     public a = 10;
   >                     public nameA = "Ten";
   >                 }
-1->Emitted(30, 1) Source(7, 1) + SourceIndex(0)
-2 >Emitted(30, 2) Source(7, 2) + SourceIndex(0)
-3 >Emitted(30, 2) Source(4, 1) + SourceIndex(0)
-4 >Emitted(30, 3) Source(4, 23) + SourceIndex(0)
-5 >Emitted(30, 18) Source(4, 38) + SourceIndex(0)
-6 >Emitted(30, 21) Source(7, 2) + SourceIndex(0)
+1->Emitted(31, 1) Source(7, 1) + SourceIndex(0)
+2 >Emitted(31, 2) Source(7, 2) + SourceIndex(0)
+3 >Emitted(31, 2) Source(4, 1) + SourceIndex(0)
+4 >Emitted(31, 3) Source(4, 23) + SourceIndex(0)
+5 >Emitted(31, 18) Source(4, 38) + SourceIndex(0)
+6 >Emitted(31, 21) Source(7, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=sourceMapValidationClassWithDefaultConstructorAndExtendsClause.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/specializedInheritedConstructors1.js b/tests/baselines/reference/specializedInheritedConstructors1.js
index 5fe0e4c1d72..b355546aaf7 100644
--- a/tests/baselines/reference/specializedInheritedConstructors1.js
+++ b/tests/baselines/reference/specializedInheritedConstructors1.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/specializedOverloadWithRestParameters.js b/tests/baselines/reference/specializedOverloadWithRestParameters.js
index 20bdea5d383..c9f6b85b560 100644
--- a/tests/baselines/reference/specializedOverloadWithRestParameters.js
+++ b/tests/baselines/reference/specializedOverloadWithRestParameters.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/staticFactory1.js b/tests/baselines/reference/staticFactory1.js
index 5a3cf95ecb4..1b4234922c4 100644
--- a/tests/baselines/reference/staticFactory1.js
+++ b/tests/baselines/reference/staticFactory1.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/staticInheritance.js b/tests/baselines/reference/staticInheritance.js
index 64c8620281d..90fb0252437 100644
--- a/tests/baselines/reference/staticInheritance.js
+++ b/tests/baselines/reference/staticInheritance.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
index f214d36d6cc..d4990d38b64 100644
--- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
+++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/staticMismatchBecauseOfPrototype.js b/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
index b2882f9678d..6dabb115729 100644
--- a/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
+++ b/tests/baselines/reference/staticMismatchBecauseOfPrototype.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/staticPropSuper.js b/tests/baselines/reference/staticPropSuper.js
index b071e6dba8d..31781a40d28 100644
--- a/tests/baselines/reference/staticPropSuper.js
+++ b/tests/baselines/reference/staticPropSuper.js
@@ -44,8 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/strictModeInConstructor.js b/tests/baselines/reference/strictModeInConstructor.js
index 75ffa4ec2ce..fa5b69de450 100644
--- a/tests/baselines/reference/strictModeInConstructor.js
+++ b/tests/baselines/reference/strictModeInConstructor.js
@@ -69,8 +69,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/strictModeReservedWord.js b/tests/baselines/reference/strictModeReservedWord.js
index d762aff68f8..baae2b5408e 100644
--- a/tests/baselines/reference/strictModeReservedWord.js
+++ b/tests/baselines/reference/strictModeReservedWord.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
index 9818d4c3cce..79f2fd4d226 100644
--- a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
+++ b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
index 5a959a81e57..9ccba0029bf 100644
--- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
+++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations2.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js b/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
index 80819867c0e..7804c003c2d 100644
--- a/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
+++ b/tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypesOfTypeParameter.js b/tests/baselines/reference/subtypesOfTypeParameter.js
index 186b6c60809..abfbab4b9d7 100644
--- a/tests/baselines/reference/subtypesOfTypeParameter.js
+++ b/tests/baselines/reference/subtypesOfTypeParameter.js
@@ -115,8 +115,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
index 267ebc5aa2a..f5bbcaa5b13 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints.js
@@ -177,8 +177,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
index 7fc78fef16a..cb7c4ec7f0d 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithConstraints4.js
@@ -88,8 +88,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
index 56869ee2ad0..1845966cb67 100644
--- a/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
+++ b/tests/baselines/reference/subtypesOfTypeParameterWithRecursiveConstraints.js
@@ -167,8 +167,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingTransitivity.js b/tests/baselines/reference/subtypingTransitivity.js
index e951bbaba58..cfc66d95a15 100644
--- a/tests/baselines/reference/subtypingTransitivity.js
+++ b/tests/baselines/reference/subtypingTransitivity.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.js b/tests/baselines/reference/subtypingWithCallSignatures2.js
index d70673825a4..89a13ff13eb 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.js
@@ -182,8 +182,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.js b/tests/baselines/reference/subtypingWithCallSignatures3.js
index d2b9399eee8..ec15d8dc63c 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.js
@@ -129,8 +129,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithCallSignatures4.js b/tests/baselines/reference/subtypingWithCallSignatures4.js
index 270ea29a4c8..287908e373b 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.js
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.js
@@ -121,8 +121,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.js b/tests/baselines/reference/subtypingWithConstructSignatures2.js
index 03a17252477..8af59214c18 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.js
@@ -182,8 +182,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.js b/tests/baselines/reference/subtypingWithConstructSignatures3.js
index a16f4677525..765e2f2b388 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.js
@@ -131,8 +131,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures4.js b/tests/baselines/reference/subtypingWithConstructSignatures4.js
index 2a13d91c225..aeb7f1bd193 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.js
@@ -121,8 +121,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures5.js b/tests/baselines/reference/subtypingWithConstructSignatures5.js
index c3459967680..d81166ce7fc 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.js
@@ -59,8 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures6.js b/tests/baselines/reference/subtypingWithConstructSignatures6.js
index b0e07126be0..1e7b9752a88 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures6.js
+++ b/tests/baselines/reference/subtypingWithConstructSignatures6.js
@@ -62,8 +62,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer.js b/tests/baselines/reference/subtypingWithNumericIndexer.js
index 61d1243a056..92862f6b327 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer3.js b/tests/baselines/reference/subtypingWithNumericIndexer3.js
index 1e125e56b5b..3842353a421 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer3.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer3.js
@@ -53,8 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithNumericIndexer4.js b/tests/baselines/reference/subtypingWithNumericIndexer4.js
index 32e083ab8bd..6273a0a6e6f 100644
--- a/tests/baselines/reference/subtypingWithNumericIndexer4.js
+++ b/tests/baselines/reference/subtypingWithNumericIndexer4.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithObjectMembers.js b/tests/baselines/reference/subtypingWithObjectMembers.js
index 8393fdb0fca..5e7afcedee6 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers.js
@@ -76,8 +76,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithObjectMembers4.js b/tests/baselines/reference/subtypingWithObjectMembers4.js
index 1fc3784fefe..752c9ea52c5 100644
--- a/tests/baselines/reference/subtypingWithObjectMembers4.js
+++ b/tests/baselines/reference/subtypingWithObjectMembers4.js
@@ -43,8 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
index 5420c3c3399..93de82e6777 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility.js
@@ -43,8 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
index e95ae5f90d7..b8cc088d3d6 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
+++ b/tests/baselines/reference/subtypingWithObjectMembersAccessibility2.js
@@ -71,8 +71,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithStringIndexer.js b/tests/baselines/reference/subtypingWithStringIndexer.js
index 602d8952842..c24d80f1470 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer.js
@@ -50,8 +50,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithStringIndexer3.js b/tests/baselines/reference/subtypingWithStringIndexer3.js
index 85e617304cf..dea9dc21f27 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer3.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer3.js
@@ -53,8 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/subtypingWithStringIndexer4.js b/tests/baselines/reference/subtypingWithStringIndexer4.js
index f086a80dc3f..32e6151eaf2 100644
--- a/tests/baselines/reference/subtypingWithStringIndexer4.js
+++ b/tests/baselines/reference/subtypingWithStringIndexer4.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/super.js b/tests/baselines/reference/super.js
index 58b2d058a42..8ad74974054 100644
--- a/tests/baselines/reference/super.js
+++ b/tests/baselines/reference/super.js
@@ -46,8 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/super1.js b/tests/baselines/reference/super1.js
index 6a57c71030a..f512611bf9d 100644
--- a/tests/baselines/reference/super1.js
+++ b/tests/baselines/reference/super1.js
@@ -75,8 +75,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/super2.js b/tests/baselines/reference/super2.js
index bfe5160184d..c7e5082ba6c 100644
--- a/tests/baselines/reference/super2.js
+++ b/tests/baselines/reference/super2.js
@@ -59,8 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superAccess.js b/tests/baselines/reference/superAccess.js
index 65c71d5551f..2b2d1828aad 100644
--- a/tests/baselines/reference/superAccess.js
+++ b/tests/baselines/reference/superAccess.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superAccess2.js b/tests/baselines/reference/superAccess2.js
index 1cd4e446dac..33e88304123 100644
--- a/tests/baselines/reference/superAccess2.js
+++ b/tests/baselines/reference/superAccess2.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superAccessCastedCall.js b/tests/baselines/reference/superAccessCastedCall.js
index 0df0acc27aa..3203e0e1d63 100644
--- a/tests/baselines/reference/superAccessCastedCall.js
+++ b/tests/baselines/reference/superAccessCastedCall.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superAccessInFatArrow1.js b/tests/baselines/reference/superAccessInFatArrow1.js
index e689e55aea4..18cf1dfb7b2 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.js
+++ b/tests/baselines/reference/superAccessInFatArrow1.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallArgsMustMatch.js b/tests/baselines/reference/superCallArgsMustMatch.js
index fe683a2eb06..8f960589185 100644
--- a/tests/baselines/reference/superCallArgsMustMatch.js
+++ b/tests/baselines/reference/superCallArgsMustMatch.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallAssignResult.js b/tests/baselines/reference/superCallAssignResult.js
index ded81aa902c..da1e783e845 100644
--- a/tests/baselines/reference/superCallAssignResult.js
+++ b/tests/baselines/reference/superCallAssignResult.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing1.js b/tests/baselines/reference/superCallBeforeThisAccessing1.js
index b9041fe2ea1..cd4a3b01b10 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing1.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing1.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing2.js b/tests/baselines/reference/superCallBeforeThisAccessing2.js
index 69c3e36c5cd..46aef974712 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing2.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing2.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing3.js b/tests/baselines/reference/superCallBeforeThisAccessing3.js
index c5d69413454..aa8e5d18b89 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing3.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing3.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing4.js b/tests/baselines/reference/superCallBeforeThisAccessing4.js
index 192615a8386..df968b2ec5e 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing4.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing4.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing5.js b/tests/baselines/reference/superCallBeforeThisAccessing5.js
index 5a0e1b4b532..983d72ed404 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing5.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing5.js
@@ -16,8 +16,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing6.js b/tests/baselines/reference/superCallBeforeThisAccessing6.js
index df6111c2968..6623d55985e 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing6.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing6.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing7.js b/tests/baselines/reference/superCallBeforeThisAccessing7.js
index 3e54ea4919e..5c76d43f480 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing7.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing7.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallBeforeThisAccessing8.js b/tests/baselines/reference/superCallBeforeThisAccessing8.js
index 846b10236b2..7ff0ab7f429 100644
--- a/tests/baselines/reference/superCallBeforeThisAccessing8.js
+++ b/tests/baselines/reference/superCallBeforeThisAccessing8.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
index dd53198d5f5..a1468ab1ff7 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
index 0519c6979e7..7924c74a82b 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
index e0617a91ad0..dc6c9c34d35 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithIncorrectNumberOfTypeArguments1.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
index 4f6ba1f6ceb..91f258602e6 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericTypeButWithNoTypeArguments1.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
index b4ecbb6d0b6..c19ba063c5d 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
+++ b/tests/baselines/reference/superCallFromClassThatDerivesNonGenericTypeButWithTypeArguments1.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallInNonStaticMethod.js b/tests/baselines/reference/superCallInNonStaticMethod.js
index 40422e84749..24fb622ccc4 100644
--- a/tests/baselines/reference/superCallInNonStaticMethod.js
+++ b/tests/baselines/reference/superCallInNonStaticMethod.js
@@ -59,8 +59,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallInStaticMethod.js b/tests/baselines/reference/superCallInStaticMethod.js
index 5d0209eedd2..3f2f8ca1eff 100644
--- a/tests/baselines/reference/superCallInStaticMethod.js
+++ b/tests/baselines/reference/superCallInStaticMethod.js
@@ -55,8 +55,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallInsideClassDeclaration.js b/tests/baselines/reference/superCallInsideClassDeclaration.js
index 7f76fd0be68..381a671ec82 100644
--- a/tests/baselines/reference/superCallInsideClassDeclaration.js
+++ b/tests/baselines/reference/superCallInsideClassDeclaration.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallInsideClassExpression.js b/tests/baselines/reference/superCallInsideClassExpression.js
index 520fa39fd73..84ffd8e9fb6 100644
--- a/tests/baselines/reference/superCallInsideClassExpression.js
+++ b/tests/baselines/reference/superCallInsideClassExpression.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallInsideObjectLiteralExpression.js b/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
index b5476c9b2bc..085c3f84f56 100644
--- a/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
+++ b/tests/baselines/reference/superCallInsideObjectLiteralExpression.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallOutsideConstructor.js b/tests/baselines/reference/superCallOutsideConstructor.js
index 77f76e1282e..12937ccfa81 100644
--- a/tests/baselines/reference/superCallOutsideConstructor.js
+++ b/tests/baselines/reference/superCallOutsideConstructor.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallParameterContextualTyping1.js b/tests/baselines/reference/superCallParameterContextualTyping1.js
index 8dc37241f29..addb0a9ba22 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping1.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping1.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallParameterContextualTyping2.js b/tests/baselines/reference/superCallParameterContextualTyping2.js
index c5f6a1ab400..4a9266de4c5 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping2.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping2.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallParameterContextualTyping3.js b/tests/baselines/reference/superCallParameterContextualTyping3.js
index 67cd1695fa7..1838072b627 100644
--- a/tests/baselines/reference/superCallParameterContextualTyping3.js
+++ b/tests/baselines/reference/superCallParameterContextualTyping3.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallWithCommentEmit01.js b/tests/baselines/reference/superCallWithCommentEmit01.js
index acad3d95783..a7c2020052a 100644
--- a/tests/baselines/reference/superCallWithCommentEmit01.js
+++ b/tests/baselines/reference/superCallWithCommentEmit01.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallWithMissingBaseClass.js b/tests/baselines/reference/superCallWithMissingBaseClass.js
index 9837544119f..61660eafd64 100644
--- a/tests/baselines/reference/superCallWithMissingBaseClass.js
+++ b/tests/baselines/reference/superCallWithMissingBaseClass.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCalls.js b/tests/baselines/reference/superCalls.js
index 9dca6526d95..9730557a34b 100644
--- a/tests/baselines/reference/superCalls.js
+++ b/tests/baselines/reference/superCalls.js
@@ -39,8 +39,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superCallsInConstructor.js b/tests/baselines/reference/superCallsInConstructor.js
index 450a7d06321..e963a9fafd3 100644
--- a/tests/baselines/reference/superCallsInConstructor.js
+++ b/tests/baselines/reference/superCallsInConstructor.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superElementAccess.js b/tests/baselines/reference/superElementAccess.js
index 5cd7b5a74f0..39ec3d25582 100644
--- a/tests/baselines/reference/superElementAccess.js
+++ b/tests/baselines/reference/superElementAccess.js
@@ -44,8 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superErrors.js b/tests/baselines/reference/superErrors.js
index 51ff643f084..5781964bbe4 100644
--- a/tests/baselines/reference/superErrors.js
+++ b/tests/baselines/reference/superErrors.js
@@ -60,8 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superHasMethodsFromMergedInterface.js b/tests/baselines/reference/superHasMethodsFromMergedInterface.js
index 61880906988..dbf9fd28844 100644
--- a/tests/baselines/reference/superHasMethodsFromMergedInterface.js
+++ b/tests/baselines/reference/superHasMethodsFromMergedInterface.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superInCatchBlock1.js b/tests/baselines/reference/superInCatchBlock1.js
index 5090b8e7071..6e631780236 100644
--- a/tests/baselines/reference/superInCatchBlock1.js
+++ b/tests/baselines/reference/superInCatchBlock1.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superInConstructorParam1.js b/tests/baselines/reference/superInConstructorParam1.js
index 2586346f83b..eac4af99e83 100644
--- a/tests/baselines/reference/superInConstructorParam1.js
+++ b/tests/baselines/reference/superInConstructorParam1.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superInLambdas.js b/tests/baselines/reference/superInLambdas.js
index fbb718d3f1a..50e7039768f 100644
--- a/tests/baselines/reference/superInLambdas.js
+++ b/tests/baselines/reference/superInLambdas.js
@@ -76,8 +76,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superInObjectLiterals_ES5.js b/tests/baselines/reference/superInObjectLiterals_ES5.js
index 569a897134c..257bc39a239 100644
--- a/tests/baselines/reference/superInObjectLiterals_ES5.js
+++ b/tests/baselines/reference/superInObjectLiterals_ES5.js
@@ -68,8 +68,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superNewCall1.js b/tests/baselines/reference/superNewCall1.js
index ea6607aee5b..1f015132cac 100644
--- a/tests/baselines/reference/superNewCall1.js
+++ b/tests/baselines/reference/superNewCall1.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superNoModifiersCrash.js b/tests/baselines/reference/superNoModifiersCrash.js
index 4f068792450..021b897532a 100644
--- a/tests/baselines/reference/superNoModifiersCrash.js
+++ b/tests/baselines/reference/superNoModifiersCrash.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superPropertyAccess.js b/tests/baselines/reference/superPropertyAccess.js
index 89b7df11aba..66803cb3adf 100644
--- a/tests/baselines/reference/superPropertyAccess.js
+++ b/tests/baselines/reference/superPropertyAccess.js
@@ -44,8 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superPropertyAccess1.js b/tests/baselines/reference/superPropertyAccess1.js
index afe50f577cf..e13521eb93a 100644
--- a/tests/baselines/reference/superPropertyAccess1.js
+++ b/tests/baselines/reference/superPropertyAccess1.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superPropertyAccess2.js b/tests/baselines/reference/superPropertyAccess2.js
index fee00146b49..0456a88661c 100644
--- a/tests/baselines/reference/superPropertyAccess2.js
+++ b/tests/baselines/reference/superPropertyAccess2.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
index 25d4bddf332..745eb47e29e 100644
--- a/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
+++ b/tests/baselines/reference/superPropertyAccessInComputedPropertiesOfNestedType_ES5.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superPropertyAccessInSuperCall01.js b/tests/baselines/reference/superPropertyAccessInSuperCall01.js
index 7f93cd13332..5b71c34d3a5 100644
--- a/tests/baselines/reference/superPropertyAccessInSuperCall01.js
+++ b/tests/baselines/reference/superPropertyAccessInSuperCall01.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superPropertyAccessNoError.js b/tests/baselines/reference/superPropertyAccessNoError.js
index e5bd5f14969..79574a2c229 100644
--- a/tests/baselines/reference/superPropertyAccessNoError.js
+++ b/tests/baselines/reference/superPropertyAccessNoError.js
@@ -85,8 +85,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superPropertyAccess_ES5.js b/tests/baselines/reference/superPropertyAccess_ES5.js
index 5994b0a0aae..b06e38e4b18 100644
--- a/tests/baselines/reference/superPropertyAccess_ES5.js
+++ b/tests/baselines/reference/superPropertyAccess_ES5.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js b/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
index a97c7a45a2c..d284bb54f66 100644
--- a/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
+++ b/tests/baselines/reference/superPropertyElementNoUnusedLexicalThisCapture.js
@@ -26,8 +26,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
index 05ac08b689c..dfd7cb74acd 100644
--- a/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
+++ b/tests/baselines/reference/superPropertyInConstructorBeforeSuperCall.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superSymbolIndexedAccess5.js b/tests/baselines/reference/superSymbolIndexedAccess5.js
index 4256ed6c9fc..3c4712dd9da 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess5.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess5.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superSymbolIndexedAccess6.js b/tests/baselines/reference/superSymbolIndexedAccess6.js
index b5b68ae9e71..43d6c7ce9bc 100644
--- a/tests/baselines/reference/superSymbolIndexedAccess6.js
+++ b/tests/baselines/reference/superSymbolIndexedAccess6.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superWithGenericSpecialization.js b/tests/baselines/reference/superWithGenericSpecialization.js
index ab1d306ccbc..43c277106f5 100644
--- a/tests/baselines/reference/superWithGenericSpecialization.js
+++ b/tests/baselines/reference/superWithGenericSpecialization.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superWithGenerics.js b/tests/baselines/reference/superWithGenerics.js
index 1c0f8eb85cc..73136ccbfb5 100644
--- a/tests/baselines/reference/superWithGenerics.js
+++ b/tests/baselines/reference/superWithGenerics.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superWithTypeArgument.js b/tests/baselines/reference/superWithTypeArgument.js
index 0d677d2a6b0..1201db208d8 100644
--- a/tests/baselines/reference/superWithTypeArgument.js
+++ b/tests/baselines/reference/superWithTypeArgument.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superWithTypeArgument2.js b/tests/baselines/reference/superWithTypeArgument2.js
index 8c2ba03e299..179b13adacf 100644
--- a/tests/baselines/reference/superWithTypeArgument2.js
+++ b/tests/baselines/reference/superWithTypeArgument2.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/superWithTypeArgument3.js b/tests/baselines/reference/superWithTypeArgument3.js
index 8bbd1f1c65e..75757d76828 100644
--- a/tests/baselines/reference/superWithTypeArgument3.js
+++ b/tests/baselines/reference/superWithTypeArgument3.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
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 e14a69ca330..fd364d4e9be 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
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/switchStatements.js b/tests/baselines/reference/switchStatements.js
index 27409f14eb0..94d18716d8b 100644
--- a/tests/baselines/reference/switchStatements.js
+++ b/tests/baselines/reference/switchStatements.js
@@ -64,8 +64,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/systemModuleWithSuperClass.js b/tests/baselines/reference/systemModuleWithSuperClass.js
index c03bb3f0872..e2640811bac 100644
--- a/tests/baselines/reference/systemModuleWithSuperClass.js
+++ b/tests/baselines/reference/systemModuleWithSuperClass.js
@@ -39,8 +39,9 @@ System.register(["./foo"], function (exports_1, context_1) {
             return extendStatics(d, b);
         };
         return function (d, b) {
-            if (typeof b !== "function" && b !== null)
+            if (typeof b !== "function" && b !== null) {
                 throw new TypeError("Class extends value " + b + " is not a constructor or null");
+            }
             extendStatics(d, b);
             function __() { this.constructor = d; }
             d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/targetTypeBaseCalls.js b/tests/baselines/reference/targetTypeBaseCalls.js
index e186e1b6618..d33fcdcfe72 100644
--- a/tests/baselines/reference/targetTypeBaseCalls.js
+++ b/tests/baselines/reference/targetTypeBaseCalls.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js b/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
index 60b67b9d1b3..0f89e8b29e6 100644
--- a/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
+++ b/tests/baselines/reference/thisConditionalOnMethodReturnOfGenericInstance.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/thisInInvalidContexts.js b/tests/baselines/reference/thisInInvalidContexts.js
index 1557b9d1572..206df67849c 100644
--- a/tests/baselines/reference/thisInInvalidContexts.js
+++ b/tests/baselines/reference/thisInInvalidContexts.js
@@ -57,8 +57,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
index b310cbfa26f..9be13e16c2b 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
@@ -58,8 +58,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/thisInSuperCall.js b/tests/baselines/reference/thisInSuperCall.js
index 24ff1be045a..9e50377314e 100644
--- a/tests/baselines/reference/thisInSuperCall.js
+++ b/tests/baselines/reference/thisInSuperCall.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/thisInSuperCall1.js b/tests/baselines/reference/thisInSuperCall1.js
index 272299f6ec3..0ab5af1e762 100644
--- a/tests/baselines/reference/thisInSuperCall1.js
+++ b/tests/baselines/reference/thisInSuperCall1.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/thisInSuperCall2.js b/tests/baselines/reference/thisInSuperCall2.js
index 09b3336d98b..45599a5b231 100644
--- a/tests/baselines/reference/thisInSuperCall2.js
+++ b/tests/baselines/reference/thisInSuperCall2.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/thisInSuperCall3.js b/tests/baselines/reference/thisInSuperCall3.js
index 69d5892b702..d86def33846 100644
--- a/tests/baselines/reference/thisInSuperCall3.js
+++ b/tests/baselines/reference/thisInSuperCall3.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js b/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
index 76ef6df943d..c575bb64bf3 100644
--- a/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
+++ b/tests/baselines/reference/thisIndexOnExistingReadonlyFieldIsNotNever.js
@@ -32,8 +32,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/thisTypeInFunctions.js b/tests/baselines/reference/thisTypeInFunctions.js
index 9dcee70745d..11f14828e7a 100644
--- a/tests/baselines/reference/thisTypeInFunctions.js
+++ b/tests/baselines/reference/thisTypeInFunctions.js
@@ -203,8 +203,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/thisTypeInFunctions3.js b/tests/baselines/reference/thisTypeInFunctions3.js
index 6252d088f44..3f42f227213 100644
--- a/tests/baselines/reference/thisTypeInFunctions3.js
+++ b/tests/baselines/reference/thisTypeInFunctions3.js
@@ -19,8 +19,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxAttributeResolution15.js b/tests/baselines/reference/tsxAttributeResolution15.js
index f8e280838ad..5e1d98219a2 100644
--- a/tests/baselines/reference/tsxAttributeResolution15.js
+++ b/tests/baselines/reference/tsxAttributeResolution15.js
@@ -25,8 +25,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxAttributeResolution16.js b/tests/baselines/reference/tsxAttributeResolution16.js
index c9cb2806d40..312a8df0796 100644
--- a/tests/baselines/reference/tsxAttributeResolution16.js
+++ b/tests/baselines/reference/tsxAttributeResolution16.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
index 20970c59e77..c4b84a51adb 100644
--- a/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
+++ b/tests/baselines/reference/tsxCorrectlyParseLessThanComparison1.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution1.js b/tests/baselines/reference/tsxDefaultAttributesResolution1.js
index 60a8c1bb38d..94002953889 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution1.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution1.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution2.js b/tests/baselines/reference/tsxDefaultAttributesResolution2.js
index fe55e8b372d..08934728467 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution2.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution2.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxDefaultAttributesResolution3.js b/tests/baselines/reference/tsxDefaultAttributesResolution3.js
index a6e87979fde..723689e049d 100644
--- a/tests/baselines/reference/tsxDefaultAttributesResolution3.js
+++ b/tests/baselines/reference/tsxDefaultAttributesResolution3.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxDynamicTagName5.js b/tests/baselines/reference/tsxDynamicTagName5.js
index f97c7e5fc1f..269e8442b06 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxDynamicTagName7.js b/tests/baselines/reference/tsxDynamicTagName7.js
index fb84fea6657..a41c9967084 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxDynamicTagName8.js b/tests/baselines/reference/tsxDynamicTagName8.js
index d719dde6809..5e0b8f5558d 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxDynamicTagName9.js b/tests/baselines/reference/tsxDynamicTagName9.js
index e965cd4f855..ededc625796 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxExternalModuleEmit1.js b/tests/baselines/reference/tsxExternalModuleEmit1.js
index 20bcc100d22..208a11a9eef 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -40,8 +40,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -71,8 +72,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxFragmentChildrenCheck.js b/tests/baselines/reference/tsxFragmentChildrenCheck.js
index 353b2e2a731..86ce6221986 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.js
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.js
@@ -46,8 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxGenericAttributesType3.js b/tests/baselines/reference/tsxGenericAttributesType3.js
index f4646f5ac3c..c0d8b29ff47 100644
--- a/tests/baselines/reference/tsxGenericAttributesType3.js
+++ b/tests/baselines/reference/tsxGenericAttributesType3.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxGenericAttributesType4.js b/tests/baselines/reference/tsxGenericAttributesType4.js
index 4f475cca953..e0a271f106d 100644
--- a/tests/baselines/reference/tsxGenericAttributesType4.js
+++ b/tests/baselines/reference/tsxGenericAttributesType4.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxGenericAttributesType5.js b/tests/baselines/reference/tsxGenericAttributesType5.js
index ff65a82766e..92afb996e7a 100644
--- a/tests/baselines/reference/tsxGenericAttributesType5.js
+++ b/tests/baselines/reference/tsxGenericAttributesType5.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxGenericAttributesType6.js b/tests/baselines/reference/tsxGenericAttributesType6.js
index 544fd73b34e..002a63f1080 100644
--- a/tests/baselines/reference/tsxGenericAttributesType6.js
+++ b/tests/baselines/reference/tsxGenericAttributesType6.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxGenericAttributesType9.js b/tests/baselines/reference/tsxGenericAttributesType9.js
index aedcec369a1..b1329b31a23 100644
--- a/tests/baselines/reference/tsxGenericAttributesType9.js
+++ b/tests/baselines/reference/tsxGenericAttributesType9.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxLibraryManagedAttributes.js b/tests/baselines/reference/tsxLibraryManagedAttributes.js
index 92fd3d2a39a..2a41c1a8894 100644
--- a/tests/baselines/reference/tsxLibraryManagedAttributes.js
+++ b/tests/baselines/reference/tsxLibraryManagedAttributes.js
@@ -135,8 +135,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
index 504fb3d6fd5..c5dc176c031 100644
--- a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
+++ b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution1.js b/tests/baselines/reference/tsxSpreadAttributesResolution1.js
index 9698a478748..c9485b956bb 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution1.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution1.js
@@ -24,8 +24,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution10.js b/tests/baselines/reference/tsxSpreadAttributesResolution10.js
index 453e1bb86b4..eca3e2db18f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution10.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution10.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution11.js b/tests/baselines/reference/tsxSpreadAttributesResolution11.js
index 02a30309695..e943531e7d6 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution11.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution11.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution12.js b/tests/baselines/reference/tsxSpreadAttributesResolution12.js
index b774f3259a8..5153086903a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution12.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution12.js
@@ -42,8 +42,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution17.js b/tests/baselines/reference/tsxSpreadAttributesResolution17.js
index cf3e8a3a0da..cffc7e69f3f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution17.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution17.js
@@ -29,8 +29,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution2.js b/tests/baselines/reference/tsxSpreadAttributesResolution2.js
index c4fb822a4ef..8e27eb15d12 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution2.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution2.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution3.js b/tests/baselines/reference/tsxSpreadAttributesResolution3.js
index 562d6da842a..6529fa98909 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution3.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution3.js
@@ -31,8 +31,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution4.js b/tests/baselines/reference/tsxSpreadAttributesResolution4.js
index 5859238eff1..fa25dc1e36f 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution4.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution4.js
@@ -44,8 +44,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution5.js b/tests/baselines/reference/tsxSpreadAttributesResolution5.js
index d605b16ccf0..556df2263b4 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution5.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution5.js
@@ -43,8 +43,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution6.js b/tests/baselines/reference/tsxSpreadAttributesResolution6.js
index 57b22fb1e20..bf0e8118661 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution6.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution6.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution7.js b/tests/baselines/reference/tsxSpreadAttributesResolution7.js
index 7a7214ca7f6..bff8d86000a 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution7.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution7.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution8.js b/tests/baselines/reference/tsxSpreadAttributesResolution8.js
index 07c36cfc5a5..203665f8505 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution8.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution8.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadAttributesResolution9.js b/tests/baselines/reference/tsxSpreadAttributesResolution9.js
index 04e77f960d4..3958b722d3e 100644
--- a/tests/baselines/reference/tsxSpreadAttributesResolution9.js
+++ b/tests/baselines/reference/tsxSpreadAttributesResolution9.js
@@ -34,8 +34,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
index 2929d413384..f077b435cdd 100644
--- a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
+++ b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.js b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
index 6869bce4982..456fb843e4c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents2.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.js
@@ -47,8 +47,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxUnionElementType3.js b/tests/baselines/reference/tsxUnionElementType3.js
index 1cb1fa61d05..e2dcee2eefe 100644
--- a/tests/baselines/reference/tsxUnionElementType3.js
+++ b/tests/baselines/reference/tsxUnionElementType3.js
@@ -46,8 +46,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxUnionElementType4.js b/tests/baselines/reference/tsxUnionElementType4.js
index 28e0a03be76..4cee2d6d536 100644
--- a/tests/baselines/reference/tsxUnionElementType4.js
+++ b/tests/baselines/reference/tsxUnionElementType4.js
@@ -45,8 +45,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/tsxUnionTypeComponent1.js b/tests/baselines/reference/tsxUnionTypeComponent1.js
index 642ee60382f..aa0cf6cc14a 100644
--- a/tests/baselines/reference/tsxUnionTypeComponent1.js
+++ b/tests/baselines/reference/tsxUnionTypeComponent1.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js b/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
index 0963813244b..4b55d1cbae0 100644
--- a/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
+++ b/tests/baselines/reference/typeAliasFunctionTypeSharedSymbol.js
@@ -23,8 +23,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeAssertions.js b/tests/baselines/reference/typeAssertions.js
index e546b21f1b3..d525eda14f0 100644
--- a/tests/baselines/reference/typeAssertions.js
+++ b/tests/baselines/reference/typeAssertions.js
@@ -60,8 +60,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardFunction.js b/tests/baselines/reference/typeGuardFunction.js
index fe93923a0aa..465af917351 100644
--- a/tests/baselines/reference/typeGuardFunction.js
+++ b/tests/baselines/reference/typeGuardFunction.js
@@ -91,8 +91,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.js b/tests/baselines/reference/typeGuardFunctionErrors.js
index 023fd8130f9..7d66b4902ed 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionErrors.js
@@ -176,8 +176,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardFunctionGenerics.js b/tests/baselines/reference/typeGuardFunctionGenerics.js
index 7870c9d3109..e148a983921 100644
--- a/tests/baselines/reference/typeGuardFunctionGenerics.js
+++ b/tests/baselines/reference/typeGuardFunctionGenerics.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThis.js b/tests/baselines/reference/typeGuardFunctionOfFormThis.js
index 7e7ea2701fa..1e0544332b9 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThis.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThis.js
@@ -150,8 +150,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
index 784b4cc7b89..a7a8f7053c5 100644
--- a/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
+++ b/tests/baselines/reference/typeGuardFunctionOfFormThisErrors.js
@@ -68,8 +68,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardOfFormInstanceOf.js b/tests/baselines/reference/typeGuardOfFormInstanceOf.js
index d482544c64e..04e19d27ec9 100644
--- a/tests/baselines/reference/typeGuardOfFormInstanceOf.js
+++ b/tests/baselines/reference/typeGuardOfFormInstanceOf.js
@@ -81,8 +81,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardOfFormIsType.js b/tests/baselines/reference/typeGuardOfFormIsType.js
index 9fcf125002e..a0223809175 100644
--- a/tests/baselines/reference/typeGuardOfFormIsType.js
+++ b/tests/baselines/reference/typeGuardOfFormIsType.js
@@ -45,8 +45,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardOfFormThisMember.js b/tests/baselines/reference/typeGuardOfFormThisMember.js
index c5e3bfacce5..6eaf11f1e8f 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMember.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMember.js
@@ -91,8 +91,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
index 8a7cc63221f..8adef023d1b 100644
--- a/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
+++ b/tests/baselines/reference/typeGuardOfFormThisMemberErrors.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeMatch2.js b/tests/baselines/reference/typeMatch2.js
index 5174540119b..d64296f744b 100644
--- a/tests/baselines/reference/typeMatch2.js
+++ b/tests/baselines/reference/typeMatch2.js
@@ -53,8 +53,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeOfSuperCall.js b/tests/baselines/reference/typeOfSuperCall.js
index ff8b8ad73d2..b4c42b6daf5 100644
--- a/tests/baselines/reference/typeOfSuperCall.js
+++ b/tests/baselines/reference/typeOfSuperCall.js
@@ -17,8 +17,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeParameterAsBaseClass.js b/tests/baselines/reference/typeParameterAsBaseClass.js
index d7e7d11fede..a54e4724ca9 100644
--- a/tests/baselines/reference/typeParameterAsBaseClass.js
+++ b/tests/baselines/reference/typeParameterAsBaseClass.js
@@ -11,8 +11,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeParameterAsBaseType.js b/tests/baselines/reference/typeParameterAsBaseType.js
index 8329275e562..9cd4e8eb439 100644
--- a/tests/baselines/reference/typeParameterAsBaseType.js
+++ b/tests/baselines/reference/typeParameterAsBaseType.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeParameterExtendingUnion1.js b/tests/baselines/reference/typeParameterExtendingUnion1.js
index efed8435d94..72c7e1ed2b5 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion1.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion1.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeParameterExtendingUnion2.js b/tests/baselines/reference/typeParameterExtendingUnion2.js
index d813e887290..a2086aedc39 100644
--- a/tests/baselines/reference/typeParameterExtendingUnion2.js
+++ b/tests/baselines/reference/typeParameterExtendingUnion2.js
@@ -21,8 +21,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeRelationships.js b/tests/baselines/reference/typeRelationships.js
index f0853faef55..a97f59ccc0d 100644
--- a/tests/baselines/reference/typeRelationships.js
+++ b/tests/baselines/reference/typeRelationships.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeValueConflict1.js b/tests/baselines/reference/typeValueConflict1.js
index 889911f1472..080781e1238 100644
--- a/tests/baselines/reference/typeValueConflict1.js
+++ b/tests/baselines/reference/typeValueConflict1.js
@@ -20,8 +20,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeValueConflict2.js b/tests/baselines/reference/typeValueConflict2.js
index 76e772a6bef..d88b9582313 100644
--- a/tests/baselines/reference/typeValueConflict2.js
+++ b/tests/baselines/reference/typeValueConflict2.js
@@ -27,8 +27,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeVariableTypeGuards.js b/tests/baselines/reference/typeVariableTypeGuards.js
index c404b6f983e..9847668e5c5 100644
--- a/tests/baselines/reference/typeVariableTypeGuards.js
+++ b/tests/baselines/reference/typeVariableTypeGuards.js
@@ -93,8 +93,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typeofClass2.js b/tests/baselines/reference/typeofClass2.js
index 06b9662e062..f458981edd0 100644
--- a/tests/baselines/reference/typeofClass2.js
+++ b/tests/baselines/reference/typeofClass2.js
@@ -30,8 +30,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typesWithSpecializedCallSignatures.js b/tests/baselines/reference/typesWithSpecializedCallSignatures.js
index 613d1b5bd34..e3e0d37bbae 100644
--- a/tests/baselines/reference/typesWithSpecializedCallSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedCallSignatures.js
@@ -51,8 +51,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/typesWithSpecializedConstructSignatures.js b/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
index d69e2eda2b9..3f898dee089 100644
--- a/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
+++ b/tests/baselines/reference/typesWithSpecializedConstructSignatures.js
@@ -49,8 +49,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/undeclaredBase.js b/tests/baselines/reference/undeclaredBase.js
index 91fe71e2678..82f259b7bb2 100644
--- a/tests/baselines/reference/undeclaredBase.js
+++ b/tests/baselines/reference/undeclaredBase.js
@@ -12,8 +12,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
index eae10ca7ade..276c0bce1aa 100644
--- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
+++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.js
@@ -131,8 +131,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/underscoreMapFirst.js b/tests/baselines/reference/underscoreMapFirst.js
index c8a8d4e4099..c69f16c9741 100644
--- a/tests/baselines/reference/underscoreMapFirst.js
+++ b/tests/baselines/reference/underscoreMapFirst.js
@@ -57,8 +57,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/underscoreThisInDerivedClass01.js b/tests/baselines/reference/underscoreThisInDerivedClass01.js
index 4fc222c0b8c..a47f2661ae6 100644
--- a/tests/baselines/reference/underscoreThisInDerivedClass01.js
+++ b/tests/baselines/reference/underscoreThisInDerivedClass01.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/underscoreThisInDerivedClass02.js b/tests/baselines/reference/underscoreThisInDerivedClass02.js
index b2616fdda83..b21d1fdc3ea 100644
--- a/tests/baselines/reference/underscoreThisInDerivedClass02.js
+++ b/tests/baselines/reference/underscoreThisInDerivedClass02.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/unionTypeEquivalence.js b/tests/baselines/reference/unionTypeEquivalence.js
index 489c5c59074..9b8688bd774 100644
--- a/tests/baselines/reference/unionTypeEquivalence.js
+++ b/tests/baselines/reference/unionTypeEquivalence.js
@@ -28,8 +28,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/unionTypeFromArrayLiteral.js b/tests/baselines/reference/unionTypeFromArrayLiteral.js
index f1ce62a13bf..f8f3c224655 100644
--- a/tests/baselines/reference/unionTypeFromArrayLiteral.js
+++ b/tests/baselines/reference/unionTypeFromArrayLiteral.js
@@ -36,8 +36,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/unionTypesAssignability.js b/tests/baselines/reference/unionTypesAssignability.js
index 386efe6f6a1..a7352b2545b 100644
--- a/tests/baselines/reference/unionTypesAssignability.js
+++ b/tests/baselines/reference/unionTypesAssignability.js
@@ -82,8 +82,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/unknownSymbols1.js b/tests/baselines/reference/unknownSymbols1.js
index 0e30d1e0fdf..c80ec6cfdd2 100644
--- a/tests/baselines/reference/unknownSymbols1.js
+++ b/tests/baselines/reference/unknownSymbols1.js
@@ -41,8 +41,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/unspecializedConstraints.js b/tests/baselines/reference/unspecializedConstraints.js
index e771ecf58ab..d27fd958a7b 100644
--- a/tests/baselines/reference/unspecializedConstraints.js
+++ b/tests/baselines/reference/unspecializedConstraints.js
@@ -162,8 +162,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
index 0893a139463..9d0f9f88f6c 100644
--- a/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
+++ b/tests/baselines/reference/untypedFunctionCallsWithTypeParameters1.js
@@ -52,8 +52,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/unusedClassesinNamespace4.js b/tests/baselines/reference/unusedClassesinNamespace4.js
index b9e3b55a514..cc932a000ae 100644
--- a/tests/baselines/reference/unusedClassesinNamespace4.js
+++ b/tests/baselines/reference/unusedClassesinNamespace4.js
@@ -22,8 +22,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/unusedIdentifiersConsolidated1.js b/tests/baselines/reference/unusedIdentifiersConsolidated1.js
index 72ea1ff5081..580e7a40a8c 100644
--- a/tests/baselines/reference/unusedIdentifiersConsolidated1.js
+++ b/tests/baselines/reference/unusedIdentifiersConsolidated1.js
@@ -110,8 +110,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/unusedInvalidTypeArguments.js b/tests/baselines/reference/unusedInvalidTypeArguments.js
index b5fdcc911c7..68177b5c614 100644
--- a/tests/baselines/reference/unusedInvalidTypeArguments.js
+++ b/tests/baselines/reference/unusedInvalidTypeArguments.js
@@ -61,8 +61,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
@@ -110,8 +111,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/useBeforeDeclaration_superClass.js b/tests/baselines/reference/useBeforeDeclaration_superClass.js
index 6b33a55f346..f6f15c1d12f 100644
--- a/tests/baselines/reference/useBeforeDeclaration_superClass.js
+++ b/tests/baselines/reference/useBeforeDeclaration_superClass.js
@@ -37,8 +37,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/validUseOfThisInSuper.js b/tests/baselines/reference/validUseOfThisInSuper.js
index 71bff4214c9..4903aba5a72 100644
--- a/tests/baselines/reference/validUseOfThisInSuper.js
+++ b/tests/baselines/reference/validUseOfThisInSuper.js
@@ -18,8 +18,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.js b/tests/baselines/reference/varArgsOnConstructorTypes.js
index 632d1c9e398..6106f7fb687 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.js
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.js
@@ -33,8 +33,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
index 87b79c1882b..8bc8f89703b 100644
--- a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
+++ b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign.js
@@ -76,8 +76,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
diff --git a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
index e6bb30de431..e6059cddb6b 100644
--- a/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
+++ b/tests/baselines/reference/varianceProblingAndZeroOrderIndexSignatureRelationsAlign2.js
@@ -76,8 +76,9 @@ var __extends = (this && this.__extends) || (function () {
         return extendStatics(d, b);
     };
     return function (d, b) {
-        if (typeof b !== "function" && b !== null)
+        if (typeof b !== "function" && b !== null) {
             throw new TypeError("Class extends value " + b + " is not a constructor or null");
+        }
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());